Updated Bukkit to 1.21/1.21.1 #461

OakLoaf · 2024-06-18T10:12:35Z

This pr is waiting on the Cloud Framework to fix incompatibilities. I'll run some proper tests once paper's experimental builds are slightly less crashy.

If a dev/1.21 branch could be made so I can redirect the pr towards that branch that would be great

…h number

OakLoaf · 2024-06-19T13:08:30Z

This is now functional - for anyone compiling this pr themselves please note that commands do not work currently.

bagdydad · 2024-06-19T13:56:22Z

Thank you for your help.

...forms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/NMSInjectListener.java

…ttps://stackoverflow.com/questions/56039341/get-declared-fields-of-java-lang-reflect-fields-in-jdk12/56043252#56043252)

Aaron2550 · 2024-06-23T20:19:11Z

1.21 test jar as of e7cc275 Terra-bukkit-6.5.0-BETA+e7cc27534-shaded.zip

OakLoaf · 2024-08-16T10:09:55Z

I've updated cloud to v2 - I haven't tested this quite yet and I am having some issues when reloading gradle (specifically regarding 'mixin-lifecycle' but I'm unsure if this was an previous issue or something I've caused.

Edit: I tested this - getting some odd class not found exceptions, if someone else could try building that'd be great

JerichoTorrent · 2024-08-25T02:04:01Z

I've updated cloud to v2 - I haven't tested this quite yet and I am having some issues when reloading gradle (specifically regarding 'mixin-lifecycle' but I'm unsure if this was an previous issue or something I've caused.

Edit: I tested this - getting some odd class not found exceptions, if someone else could try building that'd be great

I was able to successfully build this just for bukkit.
Not sure if this helped but I did run ./gradlew dependencies first. Then I built it specifically for bukkit: ./gradlew :platforms:Bukkit:build

I didn't care to look through the stacktrace to see what went wrong, but I suspect it has to do with something fabric related. Testing the jar now, but if anyone wants to test it themsevles, it won't let me upload here so contact me on Discord: torrentstaff

OakLoaf · 2024-08-25T08:43:52Z

This is a build only for bukkit, I won't add fabric 1.21 support. If anyone is wanting to use a working build on 1.21 I'd use Aaron's build #461 (comment) until I've got Cloud v2 working

OakLoaf · 2024-08-26T11:41:44Z

If someone could test this version on 1.21.1 that'd be great as I have only done testing on 1.21

ReferTV · 2024-08-28T13:28:24Z

If someone could test this version on 1.21.1 that'd be great as I have only done testing on 1.21

java.lang.ExceptionInInitializerError: null
	at Terra-bukkit-6.4.3-BETA+ab60f14ff-shaded.jar/com.dfsek.terra.bukkit.TerraBukkitPlugin.onEnable(TerraBukkitPlugin.java:68) ~[Terra-bukkit-6.4.3-BETA+ab60f14ff-shaded.jar:?]
	at org.bukkit.plugin.java.JavaPlugin.setEnabled(JavaPlugin.java:288) ~[paper-mojangapi-1.21.1-R0.1-SNAPSHOT.jar:?]
	at io.papermc.paper.plugin.manager.PaperPluginInstanceManager.enablePlugin(PaperPluginInstanceManager.java:202) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at io.papermc.paper.plugin.manager.PaperPluginManagerImpl.enablePlugin(PaperPluginManagerImpl.java:109) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at org.bukkit.plugin.SimplePluginManager.enablePlugin(SimplePluginManager.java:520) ~[paper-mojangapi-1.21.1-R0.1-SNAPSHOT.jar:?]
	at org.bukkit.craftbukkit.CraftServer.enablePlugin(CraftServer.java:640) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at org.bukkit.craftbukkit.CraftServer.enablePlugins(CraftServer.java:589) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at net.minecraft.server.dedicated.DedicatedServer.initServer(DedicatedServer.java:293) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at net.minecraft.server.MinecraftServer.runServer(MinecraftServer.java:1215) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at net.minecraft.server.MinecraftServer.lambda$spin$0(MinecraftServer.java:330) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at java.base/java.lang.Thread.run(Thread.java:1583) ~[?:?]
Caused by: java.lang.ArrayIndexOutOfBoundsException: Index 3 out of bounds for length 3
	at Terra-bukkit-6.4.3-BETA+ab60f14ff-shaded.jar/com.dfsek.terra.bukkit.nms.Initializer.<clinit>(Initializer.java:11) ~[Terra-bukkit-6.4.3-BETA+ab60f14ff-shaded.jar:?]
	... 11 more```

OakLoaf · 2024-08-28T13:41:08Z

If someone could test this version on 1.21.1 that'd be great as I have only done testing on 1.21

java.lang.ExceptionInInitializerError: null
	at Terra-bukkit-6.4.3-BETA+ab60f14ff-shaded.jar/com.dfsek.terra.bukkit.TerraBukkitPlugin.onEnable(TerraBukkitPlugin.java:68) ~[Terra-bukkit-6.4.3-BETA+ab60f14ff-shaded.jar:?]
	at org.bukkit.plugin.java.JavaPlugin.setEnabled(JavaPlugin.java:288) ~[paper-mojangapi-1.21.1-R0.1-SNAPSHOT.jar:?]
	at io.papermc.paper.plugin.manager.PaperPluginInstanceManager.enablePlugin(PaperPluginInstanceManager.java:202) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at io.papermc.paper.plugin.manager.PaperPluginManagerImpl.enablePlugin(PaperPluginManagerImpl.java:109) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at org.bukkit.plugin.SimplePluginManager.enablePlugin(SimplePluginManager.java:520) ~[paper-mojangapi-1.21.1-R0.1-SNAPSHOT.jar:?]
	at org.bukkit.craftbukkit.CraftServer.enablePlugin(CraftServer.java:640) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at org.bukkit.craftbukkit.CraftServer.enablePlugins(CraftServer.java:589) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at net.minecraft.server.dedicated.DedicatedServer.initServer(DedicatedServer.java:293) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at net.minecraft.server.MinecraftServer.runServer(MinecraftServer.java:1215) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at net.minecraft.server.MinecraftServer.lambda$spin$0(MinecraftServer.java:330) ~[paper-1.21.1.jar:1.21.1-52-e08e667]
	at java.base/java.lang.Thread.run(Thread.java:1583) ~[?:?]
Caused by: java.lang.ArrayIndexOutOfBoundsException: Index 3 out of bounds for length 3
	at Terra-bukkit-6.4.3-BETA+ab60f14ff-shaded.jar/com.dfsek.terra.bukkit.nms.Initializer.<clinit>(Initializer.java:11) ~[Terra-bukkit-6.4.3-BETA+ab60f14ff-shaded.jar:?]
	... 11 more```

Make sure you're building my PR as the version mentioned in your error is the latest commit from the Terra main branch

TobyWarren · 2024-08-28T22:51:50Z

@ReferTV That is not the correct branch. You've built the master not the 1.21.1 version.

ReferTV · 2024-08-29T10:34:08Z

@ReferTV That is not the correct branch. You've built the master not the 1.21.1 version.

@TobyWarren I can't build this version:

Starting a Gradle Daemon, 1 incompatible and 1 stopped Daemons could not be reused, use --status for details

> Configure project :platforms:fabric
Architectury Loom: 1.6.395
This version of Architectury Loom is in beta! Please report any issues you encounter: https://github.com/architectury/architectury-loom/issues
Architect Plugin: 3.4.155
Not publishing sources jar as it was not found. Use java.withSourcesJar() to fix.

> Configure project :platforms:mixin-common
fabric-installer.json not found in dependencies!
Not publishing sources jar as it was not found. Use java.withSourcesJar() to fix.

> Configure project :platforms:mixin-lifecycle
fabric-installer.json not found in dependencies!
Not publishing sources jar as it was not found. Use java.withSourcesJar() to fix.

FAILURE: Build failed with an exception.

* What went wrong:
Could not determine the dependencies of task ':platforms:fabric:compileJava'.
> Could not resolve all task dependencies for configuration ':platforms:fabric:compileClasspath'.
   > Could not resolve project :common:implementation:base.
     Required by:
         project :platforms:fabric
      > No matching variant of project :common:implementation:base was found. The consumer was configured to find a library for use during compile-time, compatible with Java 17, preferably in the form of class files, preferably optimized for standard JVMs, and its dependencies declared externally but:
          - Variant 'apiElements' declares a library for use during compile-time, packaged as a jar, and its dependencies declared externally:
              - Incompatible because this component declares a component, compatible with Java 21 and the consumer needed a component, compatible with Java 17
              - Other compatible attribute:
                  - Doesn't say anything about its target Java environment (preferred optimized for standard JVMs)
          - Variant 'mainSourceElements' declares a component, and its dependencies declared externally:
              - Incompatible because this component declares a component of category 'verification' and the consumer needed a library
              - Other compatible attributes:
                  - Doesn't say anything about its elements (required them preferably in the form of class files)
                  - Doesn't say anything about its target Java environment (preferred optimized for standard JVMs)
                  - Doesn't say anything about its target Java version (required compatibility with Java 17)
                  - Doesn't say anything about its usage (required compile-time)
          - Variant 'runtimeElements' declares a library for use during runtime, packaged as a jar, and its dependencies declared externally:
              - Incompatible because this component declares a component, compatible with Java 21 and the consumer needed a component, compatible with Java 17
              - Other compatible attribute:
                  - Doesn't say anything about its target Java environment (preferred optimized for standard JVMs)
          - Variant 'testResultsElementsForTest':
              - Incompatible because this component declares a component of category 'verification' and the consumer needed a library
              - Other compatible attributes:
                  - Doesn't say anything about how its dependencies are found (required its dependencies declared externally)
                  - Doesn't say anything about its elements (required them preferably in the form of class files)
                  - Doesn't say anything about its target Java environment (preferred optimized for standard JVMs)
                  - Doesn't say anything about its target Java version (required compatibility with Java 17)
                  - Doesn't say anything about its usage (required compile-time)

* Try:
> Review the variant matching algorithm at https://docs.gradle.org/8.7/userguide/variant_attributes.html#sec:abm_algorithm.
> No matching variant errors are explained in more detail at https://docs.gradle.org/8.7/userguide/variant_model.html#sub:variant-no-match.
> Run with --stacktrace option to get the stack trace.
> Run with --info or --debug option to get more log output.
> Run with --scan to get full insights.
> Get more help at https://help.gradle.org.

BUILD FAILED in 16s
4 actionable tasks: 1 executed, 3 up-to-date

OakLoaf · 2024-08-29T11:01:11Z

@ReferTV That is not the correct branch. You've built the master not the 1.21.1 version.

@TobyWarren I can't build this version:

Starting a Gradle Daemon, 1 incompatible and 1 stopped Daemons could not be reused, use --status for details

> Configure project :platforms:fabric
Architectury Loom: 1.6.395
This version of Architectury Loom is in beta! Please report any issues you encounter: https://github.com/architectury/architectury-loom/issues
Architect Plugin: 3.4.155
Not publishing sources jar as it was not found. Use java.withSourcesJar() to fix.

> Configure project :platforms:mixin-common
fabric-installer.json not found in dependencies!
Not publishing sources jar as it was not found. Use java.withSourcesJar() to fix.

> Configure project :platforms:mixin-lifecycle
fabric-installer.json not found in dependencies!
Not publishing sources jar as it was not found. Use java.withSourcesJar() to fix.

FAILURE: Build failed with an exception.

* What went wrong:
Could not determine the dependencies of task ':platforms:fabric:compileJava'.
> Could not resolve all task dependencies for configuration ':platforms:fabric:compileClasspath'.
   > Could not resolve project :common:implementation:base.
     Required by:
         project :platforms:fabric
      > No matching variant of project :common:implementation:base was found. The consumer was configured to find a library for use during compile-time, compatible with Java 17, preferably in the form of class files, preferably optimized for standard JVMs, and its dependencies declared externally but:
          - Variant 'apiElements' declares a library for use during compile-time, packaged as a jar, and its dependencies declared externally:
              - Incompatible because this component declares a component, compatible with Java 21 and the consumer needed a component, compatible with Java 17
              - Other compatible attribute:
                  - Doesn't say anything about its target Java environment (preferred optimized for standard JVMs)
          - Variant 'mainSourceElements' declares a component, and its dependencies declared externally:
              - Incompatible because this component declares a component of category 'verification' and the consumer needed a library
              - Other compatible attributes:
                  - Doesn't say anything about its elements (required them preferably in the form of class files)
                  - Doesn't say anything about its target Java environment (preferred optimized for standard JVMs)
                  - Doesn't say anything about its target Java version (required compatibility with Java 17)
                  - Doesn't say anything about its usage (required compile-time)
          - Variant 'runtimeElements' declares a library for use during runtime, packaged as a jar, and its dependencies declared externally:
              - Incompatible because this component declares a component, compatible with Java 21 and the consumer needed a component, compatible with Java 17
              - Other compatible attribute:
                  - Doesn't say anything about its target Java environment (preferred optimized for standard JVMs)
          - Variant 'testResultsElementsForTest':
              - Incompatible because this component declares a component of category 'verification' and the consumer needed a library
              - Other compatible attributes:
                  - Doesn't say anything about how its dependencies are found (required its dependencies declared externally)
                  - Doesn't say anything about its elements (required them preferably in the form of class files)
                  - Doesn't say anything about its target Java environment (preferred optimized for standard JVMs)
                  - Doesn't say anything about its target Java version (required compatibility with Java 17)
                  - Doesn't say anything about its usage (required compile-time)

* Try:
> Review the variant matching algorithm at https://docs.gradle.org/8.7/userguide/variant_attributes.html#sec:abm_algorithm.
> No matching variant errors are explained in more detail at https://docs.gradle.org/8.7/userguide/variant_model.html#sub:variant-no-match.
> Run with --stacktrace option to get the stack trace.
> Run with --info or --debug option to get more log output.
> Run with --scan to get full insights.
> Get more help at https://help.gradle.org.

BUILD FAILED in 16s
4 actionable tasks: 1 executed, 3 up-to-date

This PR is Bukkit only follow the instructions on the README to build a single platform

TobyWarren · 2024-08-29T11:03:54Z

@ReferTV "./gradlew :platforms:bukkit:build"

PapiCapi · 2024-09-01T20:14:02Z

If someone could test this version on 1.21.1 that'd be great as I have only done testing on 1.21

Don't know if you still want feedback but i don't have any issue (so far) after upgrading to 1.21.1 with your PR.
Thanks a lot ! :)

OakLoaf added 6 commits May 31, 2024 12:11

Updated Bukkit to 1.20.6

17acde0

Attempted to fix paper versions

3fa4b21

Updated to 1.20.6

4536767

Updated MinecraftVersionInfo

9e60db4

Updated bukkit platform to 1.21

4e7de50

Adjusted code for Spigot compatibility

d810cad

OakLoaf mentioned this pull request Jun 18, 2024

Updated Bukkit to 1.20.6 #458

Merged

OakLoaf added 2 commits June 19, 2024 13:33

Made patch version optional as not all Minecraft versions have a patc…

0758e13

…h number

Temporarily disabled commands whilst awaiting Cloud Framework update

fddc9a5

CoolLoong reviewed Jun 23, 2024

View reviewed changes

...forms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/NMSInjectListener.java Outdated Show resolved Hide resolved

Corrected issues with worldGenContext not correctly being set (Ref: h…

e7cc275

…ttps://stackoverflow.com/questions/56039341/get-declared-fields-of-java-lang-reflect-fields-in-jdk12/56043252#56043252)

OakLoaf and others added 2 commits July 20, 2024 20:17

Updated dependencies to Paper 1.21 snapshot

44d2357

Updated Cloud dependency to v2

922cd35

OakLoaf added 2 commits August 26, 2024 11:24

Added 1.21.1 support

08df5fc

Resolved errors when tab completing

3bef7d8

OakLoaf marked this pull request as ready for review August 26, 2024 11:38

OakLoaf requested review from dfsek, solonovamax, duplexsystem, astrsh and justaureus as code owners August 26, 2024 11:38

OakLoaf changed the title ~~Updated Bukkit to 1.21~~ Updated Bukkit to 1.21/1.21.1 Aug 26, 2024

PapiCapi mentioned this pull request Sep 1, 2024

Support Minecraft 1.21 #462

Closed

duplexsystem changed the base branch from master to dev/1.21.1 September 17, 2024 15:36

duplexsystem force-pushed the dev/1.21.1 branch from 8d01059 to dd272bc Compare September 17, 2024 15:42

duplexsystem merged commit 7304728 into PolyhedralDev:dev/1.21.1 Sep 17, 2024
1 check failed

OakLoaf deleted the dev/1.21/bukkit branch October 25, 2024 16:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated Bukkit to 1.21/1.21.1 #461

Updated Bukkit to 1.21/1.21.1 #461

OakLoaf commented Jun 18, 2024 •

edited

Loading

OakLoaf commented Jun 19, 2024

bagdydad commented Jun 19, 2024

Aaron2550 commented Jun 23, 2024

OakLoaf commented Aug 16, 2024 •

edited

Loading

JerichoTorrent commented Aug 25, 2024

OakLoaf commented Aug 25, 2024

OakLoaf commented Aug 26, 2024

ReferTV commented Aug 28, 2024 •

edited

Loading

OakLoaf commented Aug 28, 2024

TobyWarren commented Aug 28, 2024

ReferTV commented Aug 29, 2024 •

edited

Loading

OakLoaf commented Aug 29, 2024 •

edited

Loading

TobyWarren commented Aug 29, 2024

PapiCapi commented Sep 1, 2024

Updated Bukkit to 1.21/1.21.1 #461

Updated Bukkit to 1.21/1.21.1 #461

Conversation

OakLoaf commented Jun 18, 2024 • edited Loading

OakLoaf commented Jun 19, 2024

bagdydad commented Jun 19, 2024

Aaron2550 commented Jun 23, 2024

OakLoaf commented Aug 16, 2024 • edited Loading

JerichoTorrent commented Aug 25, 2024

OakLoaf commented Aug 25, 2024

OakLoaf commented Aug 26, 2024

ReferTV commented Aug 28, 2024 • edited Loading

OakLoaf commented Aug 28, 2024

TobyWarren commented Aug 28, 2024

ReferTV commented Aug 29, 2024 • edited Loading

OakLoaf commented Aug 29, 2024 • edited Loading

TobyWarren commented Aug 29, 2024

PapiCapi commented Sep 1, 2024

OakLoaf commented Jun 18, 2024 •

edited

Loading

OakLoaf commented Aug 16, 2024 •

edited

Loading

ReferTV commented Aug 28, 2024 •

edited

Loading

ReferTV commented Aug 29, 2024 •

edited

Loading

OakLoaf commented Aug 29, 2024 •

edited

Loading