Backport 2.4.6

FrozenBlock · Jul 14, 2024 · f9ec239 · f9ec239
1 parent d3df927
commit f9ec239
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -40,9 +40,9 @@
     continuity_version=3.0.0-beta.5+1.20.1
 
 # Optimization
-	sodium_version=mc1.20.1-0.5.10
+	sodium_version=mc1.20.1-0.5.11
     run_sodium = true
-    embeddium_version=VbtsS5XM
+    embeddium_version=kJkE9dfS
     run_embeddium = false
     indium_version = 1.0.34+mc1.20.1
     run_indium = true
diff --git a/src/main/java/net/frozenblock/wilderwild/advancement/FireflyBottleTrigger.java b/src/main/java/net/frozenblock/wilderwild/advancement/FireflyBottleTrigger.java
@@ -19,7 +19,7 @@
 package net.frozenblock.wilderwild.advancement;
 
 import com.google.gson.JsonObject;
-import net.frozenblock.wilderwild.WilderSharedConstants;
+import net.frozenblock.wilderwild.WilderConstants;
 import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
 import net.minecraft.advancements.critereon.DeserializationContext;
@@ -29,7 +29,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class FireflyBottleTrigger extends SimpleCriterionTrigger<FireflyBottleTrigger.TriggerInstance> {
-	static final ResourceLocation ID = WilderSharedConstants.id("firefly_bottle");
+	static final ResourceLocation ID = WilderConstants.id("firefly_bottle");
 
 	@Override
 	@NotNull

diff --git a/src/main/java/net/frozenblock/wilderwild/networking/packet/WilderSensorHiccupPacket.java b/src/main/java/net/frozenblock/wilderwild/networking/packet/WilderSensorHiccupPacket.java
@@ -26,7 +26,6 @@
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.frozenblock.wilderwild.WilderConstants;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.phys.Vec3;

diff --git a/src/main/java/net/frozenblock/wilderwild/networking/packet/WilderStoneChestLidPacket.java b/src/main/java/net/frozenblock/wilderwild/networking/packet/WilderStoneChestLidPacket.java
@@ -26,7 +26,6 @@
 import net.frozenblock.wilderwild.block.entity.StoneChestBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.server.level.ServerPlayer;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/src/main/java/net/frozenblock/wilderwild/registry/RegisterBlocks.java b/src/main/java/net/frozenblock/wilderwild/registry/RegisterBlocks.java
@@ -35,7 +35,7 @@
 import net.frozenblock.lib.item.api.FrozenCreativeTabs;
 import net.frozenblock.lib.item.api.bonemeal.BonemealBehaviors;
 import net.frozenblock.lib.storage.api.NoInteractionStorage;
-import net.frozenblock.wilderwild.WilderSharedConstants;
+import net.frozenblock.wilderwild.WilderConstants;
 import net.frozenblock.wilderwild.block.AlgaeBlock;
 import net.frozenblock.wilderwild.block.BaobabLeavesBlock;
 import net.frozenblock.wilderwild.block.BaobabNutBlock;
@@ -75,16 +75,14 @@
 import net.frozenblock.wilderwild.world.impl.sapling.BaobabSaplingGenerator;
 import net.frozenblock.wilderwild.world.impl.sapling.CypressSaplingGenerator;
 import net.frozenblock.wilderwild.world.impl.sapling.PalmSaplingGenerator;
-import net.frozenblock.wilderwild.world.impl.sapling.WWTreeGrowers;
+import net.minecraft.core.BlockSource;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Position;
 import net.minecraft.core.Registry;
 import net.minecraft.core.dispenser.AbstractProjectileDispenseBehavior;
-import net.minecraft.core.dispenser.BlockSource;
 import net.minecraft.core.dispenser.DefaultDispenseItemBehavior;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.data.BlockFamilies;
 import net.minecraft.data.BlockFamily;
 import net.minecraft.resources.ResourceKey;
@@ -94,7 +92,6 @@
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.CreativeModeTabs;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.ItemLike;

diff --git a/src/main/java/net/frozenblock/wilderwild/wind/CloudWindManager.java b/src/main/java/net/frozenblock/wilderwild/wind/CloudWindManager.java
@@ -23,10 +23,8 @@
 import net.frozenblock.wilderwild.WilderConstants;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 
 public class CloudWindManager implements WindManagerExtension {