Updated to 1.20.6

Glitchfiend · May 5, 2024 · 26d9c5c · 26d9c5c
1 parent 228844c
commit 26d9c5c
Show file tree

Hide file tree

Showing 28 changed files with 199 additions and 166 deletions.
diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
@@ -14,10 +14,10 @@ jobs:
       with:
         fetch-depth: 0
         fetch-tags: true
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'oracle'
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file

diff --git a/build.gradle b/build.gradle
@@ -40,7 +40,7 @@ subprojects {
 
     version = "${minecraft_version}-${mod_version}"
 
-    java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+    java.toolchain.languageVersion = JavaLanguageVersion.of(21)
     java.withSourcesJar()
 
     jar {
@@ -74,7 +74,7 @@ subprojects {
 
     tasks.withType(JavaCompile).configureEach {
         it.options.encoding = 'UTF-8'
-        it.options.release.set(17)
+        it.options.release.set(21)
     }
 
     processResources {
@@ -89,7 +89,7 @@ subprojects {
             mod_discord_url     : mod_discord_url,
             mod_license         : mod_license
         ]
-        filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/mods.toml', "*.mixins.json"]) {
+        filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/mods.toml', 'META-INF/neoforge.mods.toml', "*.mixins.json"]) {
             expand expandProps
         }
         inputs.properties(expandProps)

diff --git a/common/src/generated/resources/.cache/34eff76d8db6df414572b0996d464f3a4bc943ee b/common/src/generated/resources/.cache/34eff76d8db6df414572b0996d464f3a4bc943ee
@@ -1,4 +1,4 @@
-// 1.20.4	2024-01-19T10:21:08.5970511	Item Models: sereneseasons
+// 1.20.6	2024-05-05T10:18:49.4009886	Item Models: sereneseasons
 8131cb872e089e4f0ac2bccf3d4d7a25d7d92ec7 assets/sereneseasons/models/item/calendar.json
 cb387a39c39a0f4665c565e7218cd4426875246a assets/sereneseasons/models/item/calendar_00.json
 c154671ec34c7931bc05c47db4f69f21a5e413c7 assets/sereneseasons/models/item/calendar_01.json

diff --git a/common/src/generated/resources/.cache/51dc2b66606c1345aa908ef96784ba8686abe32c b/common/src/generated/resources/.cache/51dc2b66606c1345aa908ef96784ba8686abe32c
@@ -1,4 +1,4 @@
-// 1.20.4	2024-01-19T10:21:08.5955455	Block States: sereneseasons
+// 1.20.6	2024-05-05T10:18:49.3994883	Block States: sereneseasons
 edf060403d4f871caf88b27e91d713ee2be4ebc1 assets/sereneseasons/blockstates/season_sensor.json
 2797b7f59442c019e778d4e72e49c819153d75b3 assets/sereneseasons/models/block/season_sensor_autumn.json
 607600cb666bf37bc704c834d7d0ffc585b405d0 assets/sereneseasons/models/block/season_sensor_spring.json

diff --git a/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -0,0 +1,5 @@
+// 1.20.6	2024-05-05T10:18:49.3999887	Recipes
+e072858e57ee517a9ad673759ea337523f1faf58 data/sereneseasons/advancements/recipes/redstone/season_sensor.json
+a6e2e9061195651e5a5ebe536429b983725e47a8 data/sereneseasons/advancements/recipes/tools/calendar.json
+6dcfb1f16a07426dedd4bb0c22cf7e8875aaa637 data/sereneseasons/recipes/calendar.json
+3a8122eb3cd03dfa946e5daabcc7c0a9813346e2 data/sereneseasons/recipes/season_sensor.json
diff --git a/...ments/recipes/redstone/season_sensor.json → ...ments/recipes/redstone/season_sensor.json b/...ments/recipes/redstone/season_sensor.json → ...ments/recipes/redstone/season_sensor.json
@@ -1,33 +1,32 @@
 {
-  "rewards": {
-    "recipes": [
-      "sereneseasons:season_sensor"
-    ]
-  },
+  "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "sereneseasons:season_sensor"
-      }
-    },
     "has_calendar": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "items": [
-               "sereneseasons:calendar"
-            ]
+            "items": "sereneseasons:calendar"
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sereneseasons:season_sensor"
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_the_recipe",
       "has_calendar"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sereneseasons:season_sensor"
+    ]
+  }
 }
diff --git a/.../advancements/recipes/tools/calendar.json → .../advancements/recipes/tools/calendar.json b/.../advancements/recipes/tools/calendar.json → .../advancements/recipes/tools/calendar.json
@@ -1,33 +1,32 @@
 {
-  "rewards": {
-    "recipes": [
-      "sereneseasons:calendar"
-    ]
-  },
+  "parent": "minecraft:recipes/root",
   "criteria": {
     "has_clock": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "items": [
-               "minecraft:clock"
-            ]
+            "items": "minecraft:clock"
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "sereneseasons:calendar"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_clock",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_clock"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sereneseasons:calendar"
     ]
-  ]
+  }
 }
diff --git a/.../data/sereneseasons/recipes/calendar.json → .../data/sereneseasons/recipes/calendar.json b/.../data/sereneseasons/recipes/calendar.json → .../data/sereneseasons/recipes/calendar.json
@@ -1,19 +1,21 @@
 {
-  "type": "crafting_shaped",
-  "pattern": [
-    "PPP",
-    "PCP",
-    "PPP"
-  ],
+  "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
+    "C": {
+      "item": "minecraft:clock"
+    },
     "P": {
       "item": "minecraft:paper"
-    },
-	"C": {
-      "item": "minecraft:clock"
     }
   },
+  "pattern": [
+    "PPP",
+    "PCP",
+    "PPP"
+  ],
   "result": {
-    "item": "sereneseasons:calendar"
+    "count": 1,
+    "id": "sereneseasons:calendar"
   }
 }
diff --git a/common/src/generated/resources/data/sereneseasons/recipes/season_sensor.json b/common/src/generated/resources/data/sereneseasons/recipes/season_sensor.json
@@ -0,0 +1,27 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "redstone",
+  "key": {
+    "#": {
+      "item": "minecraft:cobblestone_slab"
+    },
+    "C": {
+      "item": "sereneseasons:calendar"
+    },
+    "G": {
+      "item": "minecraft:glass"
+    },
+    "Q": {
+      "item": "minecraft:quartz"
+    }
+  },
+  "pattern": [
+    "GGG",
+    "QCQ",
+    "###"
+  ],
+  "result": {
+    "count": 1,
+    "id": "sereneseasons:season_sensor"
+  }
+}
diff --git a/common/src/main/java/sereneseasons/block/SeasonSensorBlock.java b/common/src/main/java/sereneseasons/block/SeasonSensorBlock.java
@@ -96,25 +96,25 @@ public void updatePower(Level world, BlockPos pos)
     }
 
     @Override
-    public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult rayTraceResult)
+    protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult rayTraceResult)
     {
         if (player.mayBuild())
         {
-            if (world.isClientSide)
+            if (level.isClientSide)
             {
                 return InteractionResult.SUCCESS;
             }
             else
             {
                 BlockState blockstate = state.cycle(SEASON);
-                world.setBlock(pos, blockstate, 4);
-                updatePower(world, pos);
+                level.setBlock(pos, blockstate, 4);
+                updatePower(level, pos);
                 return InteractionResult.SUCCESS;
             }
         }
         else
         {
-            return super.use(state, world, pos, player, hand, rayTraceResult);
+            return super.useWithoutItem(state, level, pos, player, rayTraceResult);
         }
     }
 

diff --git a/common/src/main/java/sereneseasons/item/CalendarItem.java b/common/src/main/java/sereneseasons/item/CalendarItem.java
@@ -1,11 +1,14 @@
 package sereneseasons.item;
 
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.saveddata.maps.MapId;
 import sereneseasons.api.season.SeasonHelper;
 import sereneseasons.init.ModConfig;
 import sereneseasons.season.SeasonTime;
@@ -22,13 +25,15 @@ public CalendarItem(Properties p_41383_)
     }
 
     @Override
-    public void appendHoverText(ItemStack stack, @Nullable Level world, List<Component> tooltip, TooltipFlag flag)
+    public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltip, TooltipFlag flag)
     {
-        if (world != null)
+        Level level = Minecraft.getInstance().level;
+
+        if (level != null)
         {
-            if (ModConfig.seasons.isDimensionWhitelisted(world.dimension()))
+            if (ModConfig.seasons.isDimensionWhitelisted(level.dimension()))
             {
-                int seasonCycleTicks = SeasonHelper.getSeasonState(world).getSeasonCycleTicks();
+                int seasonCycleTicks = SeasonHelper.getSeasonState(level).getSeasonCycleTicks();
                 SeasonTime time = new SeasonTime(seasonCycleTicks);
                 int subSeasonDuration = ModConfig.seasons.subSeasonDuration;
 

diff --git a/common/src/main/java/sereneseasons/season/SeasonSavedData.java b/common/src/main/java/sereneseasons/season/SeasonSavedData.java
@@ -4,6 +4,7 @@
  ******************************************************************************/
 package sereneseasons.season;
 
+import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.saveddata.SavedData;
@@ -16,16 +17,18 @@ public class SeasonSavedData extends SavedData
     public int seasonCycleTicks;
 
     @Override
-    public CompoundTag save(CompoundTag nbt)
+    public CompoundTag save(CompoundTag nbt, HolderLookup.Provider provider)
     {
         nbt.putInt("SeasonCycleTicks", this.seasonCycleTicks);
         return nbt;
     }
 
-    public static SeasonSavedData load(CompoundTag nbt)
+    public static SeasonSavedData load(CompoundTag nbt, HolderLookup.Provider provider)
     {
         SeasonSavedData data = new SeasonSavedData();
         data.seasonCycleTicks = Mth.clamp(nbt.getInt("SeasonCycleTicks"), 0, SeasonTime.ZERO.getCycleDuration());
         return data;
     }
+
+
 }
diff --git a/common/src/main/resources/data/sereneseasons/recipes/season_sensor.json b/common/src/main/resources/data/sereneseasons/recipes/season_sensor.json
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.4-SNAPSHOT"
+    id "fabric-loom" version "1.6-SNAPSHOT"
     id "com.matthewprenger.cursegradle" version "1.4.0"
 }
 

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -28,7 +28,7 @@
     "fabricloader": "*",
     "fabric": "*",
     "minecraft": "${minecraft_version}",
-    "java": ">=17",
+    "java": ">=21",
     "glitchcore": ">=${glitchcore_version}"
   },
   "accessWidener": "${mod_id}.accesswidener",