feat: Caves

gradle.properties

@@ -31,7 +31,7 @@ mappings_mc_ver=1.21
 mappings=2024.06.23
 
 # Required Dependencies
-zenith_version=1.2.16
+zenith_version=1.2.17
 unity_version=0.1.05
 aether_version=1.5.2
 nitrogen_version=1.1.22

src/main/java/net/zepalesque/redux/Redux.java

@@ -150,10 +150,4 @@ public  void packSetup(AddPackFindersEvent event) {
     public static ResourceLocation loc(String path) {
         return ResourceLocation.fromNamespaceAndPath(MODID, path);
     }
-
-    public static boolean compat(String modid) {
-        return ModList.get().isLoaded(modid);
-    }
-
-
 }

src/main/java/net/zepalesque/redux/config/ReduxConfig.java

@@ -17,11 +17,13 @@ public static class Server extends DataSerializableConfig {
         // TODO: Item component?
         public final ModConfigSpec.IntValue max_veridium_tool_infusion;
         public final ModConfigSpec.ConfigValue<Boolean> consistent_break_speeds;
+        // TODO: Other Ores
         public final ModConfigSpec.ConfigValue<Boolean> raw_ores;
+        public final ModConfigSpec.ConfigValue<Boolean> gummy_swet_nerf;
 
         public Server(ModConfigSpec.Builder builder) {
             super(() -> SERVER_SPEC, "redux_server");
-            builder.push("Tweaks");
+            builder.push("Worldgen Tweaks");
             redux_sky_colors = builder
                     .comment("Use Redux's alternative sky colors for the Aether")
                     .define("Redux Sky Colors", true);
@@ -31,20 +33,25 @@ public Server(ModConfigSpec.Builder builder) {
             cloudbed = builder
                     .comment("Replace the Aether's large Aercloud features with a noise-based cloudbed")
                     .define("Cloudbed", true);
-            raw_ores = builder
-                    .comment("Use raw ores like modern vanilla versions, instead of just getting the ore block when mining it")
-                    .define("Raw Ores", true);
+
             builder.pop();
             builder.push("Gameplay");
             max_veridium_tool_infusion = builder
                     .comment("The maximum amount of infusion a Veridium tool is able to carry. Note that by default, a tools infusion level is increased by 4 when it is infused with a single Ambrosium Shard.")
-                    .defineInRange("Max Veridium Tool Infusion", 64, 1, 127);
+                    .defineInRange("Max Veridium Tool Infusion", 64, 1, Short.MAX_VALUE);
             revamped_quicksoil_movement = builder
                     .comment("Changes quicksoil to make it use a better movement system, based on the way it worked in the Aether II: Highlands in 1.12")
                     .define("Revamped Quicksoil Movement", true);
             consistent_break_speeds = builder
                     .comment("Slows down the mining speeds of some Aether blocks, to be more vanilla-consistent")
                     .define("Consistent Break Speeds", false);
+            raw_ores = builder
+                    .comment("Use raw ores like modern vanilla versions, instead of just getting the ore block when mining it")
+                    .define("Raw Ores", true);
+            gummy_swet_nerf = builder
+                    .comment("Nerfs Gummy Swets and makes them craftable.")
+                    .gameRestart()
+                    .define("Gummy Swet Nerf", true);
             builder.pop();
         }
     }
@@ -54,11 +61,10 @@ public static class Common extends DataSerializableConfig {
         public final ModConfigSpec.ConfigValue<Boolean> bronze_dungeon_upgrade;
         public final ModConfigSpec.EnumValue<AACompatType> redux_noise;
 
-        public final ModConfigSpec.ConfigValue<Boolean> gummy_swet_nerf;
-
+        // TODO: Move this stuff to server when switching to PackConfig? assuming the configs are loaded before data stuff is initially loaded
         public Common(ModConfigSpec.Builder builder) {
             super(() -> COMMON_SPEC, "redux_common");
-            builder.push("TODO");
+            builder.push("Datapack Registration");
             redux_noise = builder
                     .comment("Uses an alternative noise for the Aether. By default, this is disabled with the Ancient Aether mod installed.")
                     .worldRestart()
@@ -67,10 +73,6 @@ public Common(ModConfigSpec.Builder builder) {
                     .comment("Upgrades the Bronze Dungeon structure with new blocks and more depth")
                     .worldRestart()
                     .define("Bronze Dungeon Upgrade", true);
-            gummy_swet_nerf = builder
-                    .comment("Nerfs Gummy Swets and makes them craftable.")
-                    .gameRestart()
-                    .define("Gummy Swet Nerf", true);
             builder.pop();
         }
     }

src/main/java/net/zepalesque/redux/config/enums/AACompatType.java

@@ -1,14 +1,14 @@
 package net.zepalesque.redux.config.enums;
 
-import net.neoforged.fml.ModList;
 import net.zepalesque.redux.Redux;
+import net.zepalesque.zenith.core.Zenith;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Supplier;
 
 // Idk if this is a good idea lul
 public enum AACompatType implements CharSequence, Supplier<Boolean> {
-    TRUE("true", () -> true), FALSE("false", () -> false), WITHOUT_AA("without_aa", () -> !Redux.compat("ancient_aether"));
+    ALWAYS_TRUE("always_true", () -> true), ALWAYS_FALSE("always_false", () -> false), WITHOUT_AA("without_aa", () -> !Zenith.loaded("ancient_aether"));
 
     private final String serialized;
     private final Supplier<Boolean> value;

src/main/java/net/zepalesque/redux/data/gen/ReduxRecipeData.java

@@ -85,7 +85,7 @@ protected void buildRecipes(@NotNull RecipeOutput output) {
                 .save(output);
 
         CompoundTag infusionInfo = new CompoundTag();
-        infusionInfo.putByte(InfusionRecipe.ADDED_INFUSION, (byte) 4);
+        infusionInfo.putShort(InfusionRecipe.ADDED_INFUSION, (short) 4);
         Holder<SoundEvent> infusionSound = ReduxSounds.INFUSE_ITEM;
 
         infuse(ReduxItems.INFUSED_VERIDIUM_PICKAXE.get(), ReduxItems.VERIDIUM_PICKAXE.get())

src/main/java/net/zepalesque/redux/item/tools/VeridiumItem.java

@@ -58,7 +58,7 @@ default ItemStack transformStack(Ingredient ingredient, ItemStack original, Reci
         if (i >= max) {
             return null;
         } else {
-            int infusion = (byte) Math.min(i + additional.getByte(InfusionRecipe.ADDED_INFUSION), max);
+            int infusion = Math.min(i + additional.getShort(InfusionRecipe.ADDED_INFUSION), max);
             original.applyComponents(DataComponentPatch.builder().set(ReduxDataComponents.INFUSION.get(), infusion).build());
             return original;
         }

src/main/java/net/zepalesque/redux/mixin/mixins/common/item/GummySwetItemMixin.java

@@ -0,0 +1,22 @@
+package net.zepalesque.redux.mixin.mixins.common.item;
+
+import com.aetherteam.aether.item.food.GummySwetItem;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.food.FoodProperties;
+import net.minecraft.world.item.ItemStack;
+import net.zepalesque.redux.config.ReduxConfig;
+import net.zepalesque.redux.item.property.ReduxFoods;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(GummySwetItem.class)
+public abstract class GummySwetItemMixin {
+
+    @WrapOperation(method = "getFoodProperties", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/Item;getFoodProperties(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/food/FoodProperties;"))
+    public FoodProperties getFoodProperties(GummySwetItem instance, ItemStack stack, LivingEntity living, Operation<FoodProperties> original) {
+        if (ReduxConfig.SERVER.gummy_swet_nerf.get()) return ReduxFoods.GUMMY_SWET_NERF;
+        else return original.call(instance, stack, living);
+    }
+}

src/main/java/net/zepalesque/redux/network/packet/AerjumpPacket.java

@@ -109,7 +109,6 @@ public static Particles decode(FriendlyByteBuf buf) {
             return new Particles(x, y, z);
         }
 
-
         public static void execute(Particles packet, IPayloadContext context) {
             Player player = Minecraft.getInstance().player;
             if (player != null) {

src/main/java/net/zepalesque/redux/network/packet/SliderSignalPacket.java

@@ -38,14 +38,11 @@ public static Signal decode(FriendlyByteBuf buf) {
             return new Signal(mobID);
         }
 
-
-
         @Override
         public Type<? extends CustomPacketPayload> type() {
             return TYPE;
         }
 
-
         public static void execute(Signal payload, IPayloadContext context) {
             ClientLevel level = Minecraft.getInstance().level;
             if (level != null) {

src/main/java/net/zepalesque/redux/recipe/ReduxRecipes.java

@@ -16,6 +16,5 @@ public class ReduxRecipes {
     public static class Serializers {
         public static final DeferredRegister<RecipeSerializer<?>> SERIALIZERS = DeferredRegister.create(BuiltInRegistries.RECIPE_SERIALIZER, Redux.MODID);
         public static final DeferredHolder<RecipeSerializer<?>, StackingRecipeSerializer<InfusionRecipe>> INFUSION = SERIALIZERS.register("infusion", InfusionRecipe.Serializer::new);
-
     }
 }

src/main/resources/aether_redux.mixins.json

@@ -24,7 +24,7 @@
     "common.entity.ai.SliderBackOffMixin",
     "common.entity.ai.SliderUpDownMixin",
     "common.item.DiggerItemMixin",
-    "common.item.ItemMixin",
+    "common.item.GummySwetItemMixin",
     "common.item.PickaxeItemMixin",
     "common.world.structure.AetherTemplateStructurePieceMixin",
     "common.world.structure.BronzeBossMixin",