lithium 0.14.0 support

TISUnion · Oct 16, 2024 · 97dbb09 · 97dbb09
1 parent c9c7eec
commit 97dbb09
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/versions/1.21.1/gradle.properties b/versions/1.21.1/gradle.properties
@@ -17,6 +17,6 @@
 	# https://masa.dy.fi/maven/carpet/fabric-carpet/
 	carpet_core_version=1.21-1.4.147+v240613
 
-	# Lithium mc1.21.1-0.13.0
-	# https://www.curseforge.com/minecraft/mc-mods/lithium/files/5618760
-	lithium_dependency=curse.maven:lithium-360438:5618760
+	# Lithium mc1.21.1-0.14.0-beta.1 for Fabric
+	# https://www.curseforge.com/minecraft/mc-mods/lithium/files/5817185
+	lithium_dependency=curse.maven:lithium-360438:5817185
diff --git a/...carpettisaddition/mixins/rule/optimizedFastEntityMovement/compat/lithium/EntityMixin.java b/...carpettisaddition/mixins/rule/optimizedFastEntityMovement/compat/lithium/EntityMixin.java
@@ -31,8 +31,8 @@
 import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import me.fallenbreath.conditionalmixin.api.annotation.Condition;
 import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
-import me.jellysquid.mods.lithium.common.entity.movement.ChunkAwareBlockCollisionSweeper;
-import me.jellysquid.mods.lithium.common.util.collections.LazyList;
+import net.caffeinemc.mods.lithium.common.entity.movement.ChunkAwareBlockCollisionSweeper;
+import net.caffeinemc.mods.lithium.common.util.collections.LazyList;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Direction;
@@ -69,7 +69,7 @@ public abstract class EntityMixin
 			method = "lithium$CollideMovement",
 			at = @At(
 					value = "NEW",
-					target = "(Ljava/util/ArrayList;Ljava/util/Iterator;)Lme/jellysquid/mods/lithium/common/util/collections/LazyList;",
+					target = "(Ljava/util/ArrayList;Ljava/util/Iterator;)Lnet/caffeinemc/mods/lithium/common/util/collections/LazyList;",
 					remap = false
 			),
 			remap = false

diff --git a/versions/1.21.2/gradle.properties b/versions/1.21.2/gradle.properties
@@ -6,7 +6,7 @@
 # Fabric Mod Metadata
 	carpet_dependency=>=1.4.156
 	minecraft_dependency=>=1.21.2-alpha.0
-	lithium_confliction=<0.13.0
+	lithium_confliction=<0.14.0
 
 # Build Information
 	# The target mc versions for the mod during mod publishing, separated with \n
@@ -17,6 +17,6 @@
 	# https://masa.dy.fi/maven/carpet/fabric-carpet/
 	carpet_core_version=com.github.Fallen-Breath:fabric-carpet:358ab6537f
 
-	# Lithium mc1.21.1-0.13.0
-	# https://www.curseforge.com/minecraft/mc-mods/lithium/files/5618760
-	lithium_dependency=curse.maven:lithium-360438:5618760
+	# Lithium mc1.21.1-0.14.0-beta.1 for Fabric
+	# https://www.curseforge.com/minecraft/mc-mods/lithium/files/5817185
+	lithium_dependency=curse.maven:lithium-360438:5817185
diff --git a/versions/mapping-1.20.6-1.21.1.txt b/versions/mapping-1.20.6-1.21.1.txt
@@ -0,0 +1,10 @@
+me.jellysquid.mods.lithium.api.inventory.LithiumInventory net.caffeinemc.mods.lithium.api.inventory.LithiumInventory
+me.jellysquid.mods.lithium.common.block.entity.inventory_change_tracking.InventoryChangeEmitter net.caffeinemc.mods.lithium.common.block.entity.inventory_change_tracking.InventoryChangeEmitter
+me.jellysquid.mods.lithium.common.config.LithiumConfig net.caffeinemc.mods.lithium.common.config.LithiumConfig
+me.jellysquid.mods.lithium.common.config.Option net.caffeinemc.mods.lithium.common.config.Option
+me.jellysquid.mods.lithium.common.entity.movement.ChunkAwareBlockCollisionSweeper net.caffeinemc.mods.lithium.common.entity.movement.ChunkAwareBlockCollisionSweeper
+me.jellysquid.mods.lithium.common.hopper.HopperHelper net.caffeinemc.mods.lithium.common.hopper.HopperHelper
+me.jellysquid.mods.lithium.common.util.collections.LazyList net.caffeinemc.mods.lithium.common.util.collections.LazyList
+me.jellysquid.mods.lithium.common.world.WorldHelper net.caffeinemc.mods.lithium.common.world.WorldHelper
+me.jellysquid.mods.lithium.common.world.WorldHelper net.caffeinemc.mods.lithium.common.world.WorldHelper
+me.jellysquid.mods.lithium.common.world.blockentity.BlockEntityGetter net.caffeinemc.mods.lithium.common.world.blockentity.BlockEntityGetter