Update to MC 1.21

CyclopsMC · Jul 15, 2024 · fd91759 · fd91759
1 parent c9e3b98
commit fd91759
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'net.neoforged.gradle.userdev' version '7.0.97'
+    id 'net.neoforged.gradle.userdev' version '7.0.145'
     id 'com.diffplug.spotless' version '5.14.3'
 }
 
@@ -27,7 +27,7 @@ base {
 }
 
 // Set Java details
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 compileJava.options.compilerArgs << "-Xmaxerrs" << "9999"
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
@@ -229,6 +229,8 @@ publishing {
 
 idea {
     module {
+        downloadSources = true
+        downloadJavadoc = true
         for (String excludeDirName in ["run", "out", "logs", "gradle"]) {
             File excludeDir = new File(projectDir, excludeDirName)
             excludeDirs.add(excludeDir)

diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,12 @@
 mod_id=evilcraft-compat
 mod_version=1.1.0
-minecraft_version=1.20.4
-neoforge_version=20.4.160-beta
-cyclopscore_version=1.19.0-429
-evilcraft_version=1.2.37-418
+minecraft_version=1.21
+neoforge_version=21.0.43-beta
+cyclopscore_version=1.19.1-462
+evilcraft_version=1.2.38-437
 release_type=release
 
-commoncapabilities_version=2.9.1-114
+commoncapabilities_version=2.9.1-126
 waila_version=1.10.8:B72_1.15.2
 mantle_version=1.12-1.3.1.22
 tconstruct_version=1.12.2-2.9.0.55
@@ -15,7 +15,7 @@ guideapi_version=2.1.4-57
 BM_version=2.2.12-97
 EE3_version=0.3.507
 IC2_version=2.8.7-ex112
-jei_version=17.3.0.52
+jei_version=19.5.0.31
 ie_version=0.12-90-521
 enderio_version=1.12.2:5.0.22
 endercore_version=1.12.2:0.5.22

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/org/cyclops/evilcraftcompat/RegistryEntriesCompat.java b/src/main/java/org/cyclops/evilcraftcompat/RegistryEntriesCompat.java
@@ -10,12 +10,12 @@
  */
 public class RegistryEntriesCompat {
 
-    public static final DeferredHolder<Item, Item> ITEM_INVIGORATING_PENDANT = DeferredHolder.create(Registries.ITEM, new ResourceLocation("evilcraft:invigorating_pendant"));
-    public static final DeferredHolder<Item, Item> ITEM_PRIMED_PENDANT = DeferredHolder.create(Registries.ITEM, new ResourceLocation("evilcraft:primed_pendant"));
-    public static final DeferredHolder<Item, Item> ITEM_KINETICATOR = DeferredHolder.create(Registries.ITEM, new ResourceLocation("evilcraft:kineticator"));
-    public static final DeferredHolder<Item, Item> ITEM_KINETICATOR_REPELLING = DeferredHolder.create(Registries.ITEM, new ResourceLocation("evilcraft:kineticator_repelling"));
-    public static final DeferredHolder<Item, Item> ITEM_MACE_OF_DESTRUCTION = DeferredHolder.create(Registries.ITEM, new ResourceLocation("evilcraft:mace_of_destruction"));
-    public static final DeferredHolder<Item, Item> ITEM_NECROMANCER_STAFF = DeferredHolder.create(Registries.ITEM, new ResourceLocation("evilcraft:necromancer_staff"));
-    public static final DeferredHolder<Item, Item> ITEM_FLESH_REJUVENATED = DeferredHolder.create(Registries.ITEM, new ResourceLocation("evilcraft:flesh_rejuvenated"));
+    public static final DeferredHolder<Item, Item> ITEM_INVIGORATING_PENDANT = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("evilcraft:invigorating_pendant"));
+    public static final DeferredHolder<Item, Item> ITEM_PRIMED_PENDANT = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("evilcraft:primed_pendant"));
+    public static final DeferredHolder<Item, Item> ITEM_KINETICATOR = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("evilcraft:kineticator"));
+    public static final DeferredHolder<Item, Item> ITEM_KINETICATOR_REPELLING = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("evilcraft:kineticator_repelling"));
+    public static final DeferredHolder<Item, Item> ITEM_MACE_OF_DESTRUCTION = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("evilcraft:mace_of_destruction"));
+    public static final DeferredHolder<Item, Item> ITEM_NECROMANCER_STAFF = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("evilcraft:necromancer_staff"));
+    public static final DeferredHolder<Item, Item> ITEM_FLESH_REJUVENATED = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("evilcraft:flesh_rejuvenated"));
 
 }
diff --git a/...ps/evilcraftcompat/modcompat/capabilities/RecipeHandlerBloodInfuserBlockEntityCompat.java b/...ps/evilcraftcompat/modcompat/capabilities/RecipeHandlerBloodInfuserBlockEntityCompat.java
@@ -69,7 +69,7 @@ public boolean isValidSizeInput(IngredientComponent<?, ?> component, int size) {
         @Nullable
         @Override
         protected IInventoryFluidTier getRecipeInputContainer(IMixedIngredients input) {
-            IInventoryFluidTier inventory = new InventoryFluidTier(NonNullList.withSize(1, ItemStack.EMPTY), NonNullList.withSize(1, FluidStack.EMPTY),
+            InventoryFluidTier inventory = new InventoryFluidTier(NonNullList.withSize(1, ItemStack.EMPTY), NonNullList.withSize(1, FluidStack.EMPTY),
                     host.getTileWorkingMetadata().getTier(host.getInventory()));
             if (!input.getInstances(IngredientComponent.ITEMSTACK).isEmpty()) {
                 inventory.setItem(0, input.getInstances(IngredientComponent.ITEMSTACK).get(0));

diff --git a/src/main/java/org/cyclops/evilcraftcompat/modcompat/jei/JEIEvilCraftConfig.java b/src/main/java/org/cyclops/evilcraftcompat/modcompat/jei/JEIEvilCraftConfig.java
@@ -119,7 +119,7 @@ public void registerGuiHandlers(IGuiHandlerRegistration registry) {
 
     @Override
     public ResourceLocation getPluginUid() {
-        return new ResourceLocation(Reference.MOD_ID, "main");
+        return ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "main");
     }
 
     public static MutableComponent getDurationSecondsTextComponent(int durationTicks) {

diff --git a/...va/org/cyclops/evilcraftcompat/modcompat/jei/bloodinfuser/BloodInfuserRecipeCategory.java b/...va/org/cyclops/evilcraftcompat/modcompat/jei/bloodinfuser/BloodInfuserRecipeCategory.java
@@ -43,7 +43,7 @@ public class BloodInfuserRecipeCategory implements IRecipeCategory<BloodInfuserR
     private final IDrawable tankOverlay;
 
     public BloodInfuserRecipeCategory(IGuiHelper guiHelper) {
-        ResourceLocation resourceLocation = new ResourceLocation(Reference.MOD_ID, Reference.TEXTURE_PATH_GUI + "blood_infuser_gui_jei.png");
+        ResourceLocation resourceLocation = ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, Reference.TEXTURE_PATH_GUI + "blood_infuser_gui_jei.png");
         this.background = guiHelper.createDrawable(resourceLocation, 0, 0, 130, 70);
         this.icon = guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(RegistryEntries.BLOCK_BLOOD_INFUSER.get()));
         IDrawableStatic arrowDrawable = guiHelper.createDrawable(resourceLocation,

diff --git a/.../modcompat/jei/environmentalaccumulator/CommonEnvironmentalAccumulatorRecipeCategory.java b/.../modcompat/jei/environmentalaccumulator/CommonEnvironmentalAccumulatorRecipeCategory.java
@@ -31,7 +31,7 @@ public CommonEnvironmentalAccumulatorRecipeCategory(IGuiHelper guiHelper, Pair<I
         this.weatherInPos = weatherInPos;
         this.weatherOutPos = weatherOutPos;
         weatherIcons = Maps.newHashMap();
-        ResourceLocation weatherResourceLocation = new ResourceLocation(Reference.MOD_ID + ":" + Reference.TEXTURE_PATH_GUI + "weathers.png");
+        ResourceLocation weatherResourceLocation = ResourceLocation.parse(Reference.MOD_ID + ":" + Reference.TEXTURE_PATH_GUI + "weathers.png");
         weatherIcons.put(WeatherType.CLEAR, guiHelper.createDrawable(weatherResourceLocation, 0, 0, 16, 16));
         weatherIcons.put(WeatherType.RAIN, guiHelper.createDrawable(weatherResourceLocation, 16, 0, 16, 16));
         weatherIcons.put(WeatherType.LIGHTNING, guiHelper.createDrawable(weatherResourceLocation, 32, 0, 16, 16));

diff --git a/...compat/modcompat/jei/environmentalaccumulator/EnvironmentalAccumulatorRecipeCategory.java b/...compat/modcompat/jei/environmentalaccumulator/EnvironmentalAccumulatorRecipeCategory.java
@@ -41,7 +41,7 @@ public class EnvironmentalAccumulatorRecipeCategory extends CommonEnvironmentalA
 
     public EnvironmentalAccumulatorRecipeCategory(IGuiHelper guiHelper) {
         super(guiHelper, Pair.of(2, 8), Pair.of(76, 8));
-        ResourceLocation resourceLocation = new ResourceLocation(Reference.MOD_ID, Reference.TEXTURE_PATH_GUI + "environmental_accumulator_gui_jei.png");
+        ResourceLocation resourceLocation = ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, Reference.TEXTURE_PATH_GUI + "environmental_accumulator_gui_jei.png");
         this.background = guiHelper.createDrawable(resourceLocation, 0, 0, 94, 54);
         this.icon = guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(RegistryEntries.BLOCK_ENVIRONMENTAL_ACCUMULATOR.get()));
         IDrawableStatic arrowDrawable = guiHelper.createDrawable(resourceLocation, 94, 0, 5, 34);

diff --git a/.../sanguinaryenvironmentalaccumulator/SanguinaryEnvironmentalAccumulatorRecipeCategory.java b/.../sanguinaryenvironmentalaccumulator/SanguinaryEnvironmentalAccumulatorRecipeCategory.java
@@ -49,7 +49,7 @@ public class SanguinaryEnvironmentalAccumulatorRecipeCategory extends CommonEnvi
 
     public SanguinaryEnvironmentalAccumulatorRecipeCategory(IGuiHelper guiHelper) {
         super(guiHelper, Pair.of(42, 8), Pair.of(96, 8));
-        ResourceLocation resourceLocation = new ResourceLocation(Reference.MOD_ID, Reference.TEXTURE_PATH_GUI + "sanguinary_environmental_accumulator_gui_jei.png");
+        ResourceLocation resourceLocation = ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, Reference.TEXTURE_PATH_GUI + "sanguinary_environmental_accumulator_gui_jei.png");
         this.background = guiHelper.createDrawable(resourceLocation, 0, 0, 130, 70);
         this.icon = guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(RegistryEntries.BLOCK_SANGUINARY_ENVIRONMENTAL_ACCUMULATOR.get()));
         IDrawableStatic arrowDrawable = guiHelper.createDrawable(resourceLocation,

diff --git a/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
@@ -21,18 +21,18 @@ EvilCraft compatibility with other mods.
 [[dependencies.evilcraftcompat]]
     modId="cyclopscore"
     type="required"
-    versionRange="[1.19.0,)"
+    versionRange="[1.19.1,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.evilcraftcompat]]
     modId="neoforge"
     type="required"
-    versionRange="[20.4,)"
+    versionRange="[21.0.43-beta,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.evilcraftcompat]]
     modId="minecraft"
     type="required"
-    versionRange="[1.20.4,]"
+    versionRange="[1.21,]"
     ordering="NONE"
     side="BOTH"