From 444b05501cc423def29b671240bcaf0f7c753182 Mon Sep 17 00:00:00 2001 From: Onyx_i7 Date: Mon, 17 Aug 2026 23:36:41 -0400 Subject: [PATCH 1/7] Modify ItemDragonCanteen to use ExtraItem for capacity --- .../simpledifficulty/item/ItemDragonCanteen.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/charles445/simpledifficulty/item/ItemDragonCanteen.java b/src/main/java/com/charles445/simpledifficulty/item/ItemDragonCanteen.java index fd20e6f..d064d32 100644 --- a/src/main/java/com/charles445/simpledifficulty/item/ItemDragonCanteen.java +++ b/src/main/java/com/charles445/simpledifficulty/item/ItemDragonCanteen.java @@ -1,10 +1,9 @@ package com.charles445.simpledifficulty.item; import com.charles445.simpledifficulty.SimpleDifficulty; -import com.charles445.simpledifficulty.api.config.ServerConfig; -import com.charles445.simpledifficulty.api.config.ServerOptions; import com.charles445.simpledifficulty.api.item.IItemCanteen; import com.charles445.simpledifficulty.api.thirst.ThirstEnum; +import com.charles445.simpledifficulty.config.json.ExtraItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagInt; @@ -13,11 +12,20 @@ public class ItemDragonCanteen extends ItemCanteen { + public static final String EI_CAPACITY = "capacity"; + private static final ThirstEnum[] THIRST_VALUES = ThirstEnum.values(); + + public int capacity = 10; - public ItemDragonCanteen() { + public ItemDragonCanteen(ExtraItem extraItem) { super(); + Integer oCapacity = extraItem.getInteger(EI_CAPACITY); + if (oCapacity != null) { + this.capacity = oCapacity.intValue(); + } + addPropertyOverride(new ResourceLocation("contain"), (stack, worldIn, entityIn) -> { if (stack.getItem() instanceof IItemCanteen) { IItemCanteen canteen = (IItemCanteen) stack.getItem(); @@ -29,7 +37,7 @@ public ItemDragonCanteen() { @Override public int getMaxDoses(ItemStack stack) { - return ServerConfig.instance.getInteger(ServerOptions.DRAGON_CANTEEN_DOSES); + return this.capacity; } @Override From e0c3c5d3036707036a0c663c654c3b78e97ac4fc Mon Sep 17 00:00:00 2001 From: Onyx_i7 Date: Mon, 17 Aug 2026 23:37:48 -0400 Subject: [PATCH 2/7] Remove frost items and dragon canteen registration Removed registration for frost_powder, frost_rod, and dragonCanteen. --- .../charles445/simpledifficulty/register/RegisterItems.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/com/charles445/simpledifficulty/register/RegisterItems.java b/src/main/java/com/charles445/simpledifficulty/register/RegisterItems.java index de93ebb..6fdff0f 100644 --- a/src/main/java/com/charles445/simpledifficulty/register/RegisterItems.java +++ b/src/main/java/com/charles445/simpledifficulty/register/RegisterItems.java @@ -65,12 +65,6 @@ public static void registerItems(RegistryEvent.Register event) ice_chestplate = registerAs("ice_chestplate", new ItemArmorTemperature(iceArmorMaterial, EntityEquipmentSlot.CHEST), registry); ice_leggings = registerAs("ice_leggings", new ItemArmorTemperature(iceArmorMaterial, EntityEquipmentSlot.LEGS), registry); ice_boots = registerAs("ice_boots", new ItemArmorTemperature(iceArmorMaterial, EntityEquipmentSlot.FEET), registry); - - frost_powder = registerAs("frost_powder", new Item(), registry); - frost_rod = registerAs("frost_rod", new Item(), registry); - - // Dragon Canteen - dragonCanteen = registerAs("dragon_canteen", new ItemDragonCanteen(), registry); //Extra Items From f148beca7bfe93fabd7e98fc074fd4e7ff0d112d Mon Sep 17 00:00:00 2001 From: Onyx_i7 Date: Mon, 17 Aug 2026 23:38:10 -0400 Subject: [PATCH 3/7] Remove unused item declarations from SDItems Removed unused item declarations for frost_powder, frost_rod, and dragonCanteen. --- .../java/com/charles445/simpledifficulty/api/SDItems.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/charles445/simpledifficulty/api/SDItems.java b/src/main/java/com/charles445/simpledifficulty/api/SDItems.java index f270a62..fd6fa09 100644 --- a/src/main/java/com/charles445/simpledifficulty/api/SDItems.java +++ b/src/main/java/com/charles445/simpledifficulty/api/SDItems.java @@ -166,8 +166,4 @@ public class SDItems { /** Ice armor boots. Provides cooling for the feet. */ public static Item ice_boots; - - public static Item frost_powder; - public static Item frost_rod; - public static Item dragonCanteen; } From f11e8952d23f375b56edf4cbe2c9582d8062f480 Mon Sep 17 00:00:00 2001 From: Onyx_i7 Date: Mon, 17 Aug 2026 23:39:02 -0400 Subject: [PATCH 4/7] Remove dragon canteen doses from configuration Removed dragon canteen doses configuration from ModConfig. --- .../com/charles445/simpledifficulty/config/ModConfig.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/com/charles445/simpledifficulty/config/ModConfig.java b/src/main/java/com/charles445/simpledifficulty/config/ModConfig.java index e8c8275..8400a45 100644 --- a/src/main/java/com/charles445/simpledifficulty/config/ModConfig.java +++ b/src/main/java/com/charles445/simpledifficulty/config/ModConfig.java @@ -91,11 +91,6 @@ public static class ConfigServerConfig @Config.Name("IronCanteenDoses") @Config.RangeInt(min=1) public int ironCanteenDoses = 8; - - @Config.Comment("Maximum number of doses in a dragon canteen") - @Config.Name("DragonCanteenDoses") - @Config.RangeInt(min=1) - public int dragonCanteenDoses = 30; @Config.Comment("Whether purified water blocks are infinite") @Config.Name("Infinite Purified Water") @@ -545,7 +540,6 @@ public static void sendLocalServerConfigToAPI() ServerConfig.instance.put(ServerOptions.CANTEEN_DOSES, server.canteenDoses); ServerConfig.instance.put(ServerOptions.STRICT_HEATERS, server.strictHeaters); ServerConfig.instance.put(ServerOptions.IRON_CANTEEN_DOSES, server.ironCanteenDoses); - ServerConfig.instance.put(ServerOptions.DRAGON_CANTEEN_DOSES, server.dragonCanteenDoses); ServerConfig.instance.put(ServerOptions.INFINITE_PURIFIED_WATER, server.infinitePurifiedWater); ServerConfig.instance.put(ServerOptions.PURIFIED_WATER_OPACITY, server.purifiedWaterOpacity); ServerConfig.instance.put(ServerOptions.SALT_WATER_THIRST, server.thirst.saltWaterThirst); @@ -565,7 +559,6 @@ private static MessageUpdateConfig getNewConfigMessage() compound.setString(ServerOptions.CANTEEN_DOSES.getName(), ""+server.canteenDoses); compound.setString(ServerOptions.STRICT_HEATERS.getName(), ""+server.strictHeaters); compound.setString(ServerOptions.IRON_CANTEEN_DOSES.getName(), ""+server.ironCanteenDoses); - compound.setString(ServerOptions.DRAGON_CANTEEN_DOSES.getName(), ""+server.dragonCanteenDoses); compound.setString(ServerOptions.INFINITE_PURIFIED_WATER.getName(), ""+server.infinitePurifiedWater); compound.setString(ServerOptions.PURIFIED_WATER_OPACITY.getName(), ""+server.purifiedWaterOpacity); compound.setString(ServerOptions.SALT_WATER_THIRST.getName(), ""+server.thirst.saltWaterThirst); From 64089bb623be95cb80275f49ecf62887402fbb4d Mon Sep 17 00:00:00 2001 From: Onyx_i7 Date: Mon, 17 Aug 2026 23:39:32 -0400 Subject: [PATCH 5/7] Remove DRAGON_CANTEEN_DOSES from ServerOptions Removed the DRAGON_CANTEEN_DOSES option from ServerOptions. --- .../charles445/simpledifficulty/api/config/ServerOptions.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/charles445/simpledifficulty/api/config/ServerOptions.java b/src/main/java/com/charles445/simpledifficulty/api/config/ServerOptions.java index 23640c7..a251ebc 100644 --- a/src/main/java/com/charles445/simpledifficulty/api/config/ServerOptions.java +++ b/src/main/java/com/charles445/simpledifficulty/api/config/ServerOptions.java @@ -12,7 +12,6 @@ public enum ServerOptions implements IConfigOption /*Integer*/ CANTEEN_DOSES ("canteenDoses"), /*Boolean*/ STRICT_HEATERS ("strictHeaters"), /*Integer*/ IRON_CANTEEN_DOSES ("ironCanteenDoses"), - /*Integer*/ DRAGON_CANTEEN_DOSES ("dragonCanteenDoses"), /*Boolean*/ INFINITE_PURIFIED_WATER ("infinitePurifiedWater"), /*Boolean*/ PURIFIED_WATER_OPACITY ("purifiedWaterOpacity"), /*Double*/ THIRST_EXHAUSTION_MULTIPLIER ("thirstExhaustionMultiplier"), From 133ced4c674dc2605d5a8d1a4e885308377faaa8 Mon Sep 17 00:00:00 2001 From: Onyx_i7 Date: Mon, 17 Aug 2026 23:54:34 -0400 Subject: [PATCH 6/7] Integrate Weather2Compat for rain detection --- .../simpledifficulty/util/internal/ThirstUtilInternal.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/charles445/simpledifficulty/util/internal/ThirstUtilInternal.java b/src/main/java/com/charles445/simpledifficulty/util/internal/ThirstUtilInternal.java index b17f439..9f82c58 100644 --- a/src/main/java/com/charles445/simpledifficulty/util/internal/ThirstUtilInternal.java +++ b/src/main/java/com/charles445/simpledifficulty/util/internal/ThirstUtilInternal.java @@ -8,6 +8,7 @@ import com.charles445.simpledifficulty.api.config.ServerOptions; import com.charles445.simpledifficulty.api.thirst.*; import com.charles445.simpledifficulty.config.ModConfig; +import com.charles445.simpledifficulty.compat.mod.Weather2Compat; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -107,7 +108,7 @@ public ThirstEnumBlockPos traceWater(EntityPlayer player) //Check if player is looking up, if it's raining, if they can see sky, and if THIRST_DRINK_RAIN is enabled //This essentially means rain can't be a trace result for drinking or for a canteen - if(player.rotationPitch < -75.0f && player.world.isRainingAt(player.getPosition()) && player.world.canSeeSky(player.getPosition()) && ServerConfig.instance.getBoolean(ServerOptions.THIRST_DRINK_RAIN)) + if(player.rotationPitch < -75.0f && Weather2Compat.isRainingAt(player.world, player.getPosition()) && player.world.canSeeSky(player.getPosition()) && ServerConfig.instance.getBoolean(ServerOptions.THIRST_DRINK_RAIN)) { //Drinking rain return new ThirstEnumBlockPos(ThirstEnum.RAIN, player.getPosition()); From 8e23fe5de50686e4deed699980dd4dbaf27c1203 Mon Sep 17 00:00:00 2001 From: Onyx_i7 Date: Mon, 17 Aug 2026 23:56:25 -0400 Subject: [PATCH 7/7] Update GitHub Actions workflow for buildmod --- .github/workflows/buildmod.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildmod.yml b/.github/workflows/buildmod.yml index 24a9717..f7a630b 100644 --- a/.github/workflows/buildmod.yml +++ b/.github/workflows/buildmod.yml @@ -2,7 +2,8 @@ name: Build SimpleDifficulty Mod on: push: - branches: [ 'main', 'master', 'testing' ] + branches-ignore: + - '1.16.5-development' workflow_dispatch: permissions: @@ -18,7 +19,7 @@ jobs: uses: actions/checkout@v7.0.1 - name: Set up JDK 25 for Gradle - uses: actions/setup-java@v5.6.0 + uses: actions/setup-java@v5.7.0 with: distribution: 'temurin' java-version: '25'