Merge pull request #672 from RakambdaOrg/feat/update

Update to 1.20.5

Author: Rakambda

build.gradle

@@ -23,7 +23,7 @@ allprojects {
     apply plugin: "java"
     apply plugin: "idea"
 
-    java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+    java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
     tasks.withType(JavaCompile).configureEach {
         options.encoding = "UTF-8"

fabric/build.gradle.kts

@@ -36,7 +36,7 @@ tasks {
     compileJava {
         options.encoding = "UTF-8"
         options.isDeprecation = true
-        options.release.set(17)
+        options.release.set(21)
     }
 }
 

fabric/src/client/java/fr/rakambda/fallingtree/fabric/client/network/FabricClientPacketHandler.java

@@ -4,6 +4,7 @@
 import fr.rakambda.fallingtree.common.network.ClientPacketHandler;
 import fr.rakambda.fallingtree.fabric.network.FallingTreeConfigPacket;
 import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
+import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 
 public class FabricClientPacketHandler implements ClientPacketHandler{
 	private final FallingTreeCommon<?> mod;
@@ -14,6 +15,7 @@ public FabricClientPacketHandler(FallingTreeCommon<?> mod){
 
 	@Override
 	public void registerClient(){
+		PayloadTypeRegistry.configurationS2C().register(FallingTreeConfigPacket.TYPE, FallingTreeConfigPacket.CODEC);
 		ClientConfigurationNetworking.registerGlobalReceiver(FallingTreeConfigPacket.TYPE, (packet, sender) -> {
 			mod.getPacketUtils().onClientConfigurationPacket(packet.getPacket());
 		});

fabric/src/main/java/fr/rakambda/fallingtree/fabric/common/wrapper/ItemStackWrapper.java

@@ -7,6 +7,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
+import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantment;
@@ -46,7 +47,7 @@ public int getMaxDamage(){
 
 	@Override
 	public void damage(int amount, @NotNull IPlayer player){
-		raw.hurtAndBreak(amount, (Player) player.getRaw(), entity -> {});
+		raw.hurtAndBreak(amount, (Player) player.getRaw(), EquipmentSlot.MAINHAND);
 	}
 
 	@Override
@@ -65,24 +66,20 @@ public int getEnchantLevel(@Nullable IEnchantment enchantment){
 
 	@Override
 	public boolean hasOneOfEnchantAtLeast(@NotNull Collection<IEnchantment> enchantments, int minLevel){
-		var itemEnchantments = EnchantmentHelper.getEnchantments(raw);
 		for(var enchantment : enchantments){
 			var key = (Enchantment) enchantment.getRaw();
-			if(itemEnchantments.containsKey(key)){
-				if(itemEnchantments.get(key) >= minLevel){
-					return true;
-				}
+			if(EnchantmentHelper.getItemEnchantmentLevel(key, raw) >= minLevel){
+				return true;
 			}
 		}
 		return false;
 	}
 
 	@NotNull
 	public Optional<IEnchantment> getAnyEnchant(@NotNull Collection<IEnchantment> enchantments){
-		var itemEnchantments = EnchantmentHelper.getEnchantments(raw);
 		for(var enchantment : enchantments){
 			var key = (Enchantment) enchantment.getRaw();
-			if(itemEnchantments.containsKey(key)){
+			if(EnchantmentHelper.getItemEnchantmentLevel(key, raw) > 0){
 				return Optional.of(enchantment);
 			}
 		}

fabric/src/main/java/fr/rakambda/fallingtree/fabric/enchant/ChopperEnchantment.java

@@ -4,10 +4,10 @@
 import fr.rakambda.fallingtree.common.config.enums.BreakMode;
 import fr.rakambda.fallingtree.common.enchant.IFallingTreeEnchantment;
 import fr.rakambda.fallingtree.fabric.common.wrapper.ItemStackWrapper;
+import net.minecraft.tags.ItemTags;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantment;
-import net.minecraft.world.item.enchantment.EnchantmentCategory;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import java.util.Optional;
@@ -17,21 +17,11 @@ public class ChopperEnchantment extends Enchantment implements IFallingTreeEncha
 	private final BreakMode breakMode;
 
 	public ChopperEnchantment(@NotNull FallingTreeCommon<?> mod, @Nullable BreakMode breakMode){
-		super(Rarity.COMMON, EnchantmentCategory.BREAKABLE, new EquipmentSlot[]{EquipmentSlot.MAINHAND});
+		super(Enchantment.definition(ItemTags.MINING_ENCHANTABLE, 1, 1, constantCost(1), constantCost(10), 1, EquipmentSlot.MAINHAND));
 		this.mod = mod;
 		this.breakMode = breakMode;
 	}
 
-	@Override
-	public int getMinCost(int i){
-		return 1;
-	}
-	
-	@Override
-	public int getMaxCost(int i){
-		return 10;
-	}
-	
 	@Override
 	public boolean isTradeable(){
 		return !mod.getConfiguration().getEnchantment().isHideEnchant();

fabric/src/main/java/fr/rakambda/fallingtree/fabric/network/FallingTreeConfigPacket.java

@@ -5,26 +5,29 @@
 import fr.rakambda.fallingtree.fabric.common.wrapper.FriendlyByteBufWrapper;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import net.fabricmc.fabric.api.networking.v1.FabricPacket;
-import net.fabricmc.fabric.api.networking.v1.PacketType;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.NotNull;
 
 @RequiredArgsConstructor
-public class FallingTreeConfigPacket implements FabricPacket{
-	public static final ResourceLocation MESSAGE_ID = new ResourceLocation(FallingTree.MOD_ID, "configuration-packet");
-	public static final PacketType<FallingTreeConfigPacket> TYPE = PacketType.create(MESSAGE_ID, buf -> new FallingTreeConfigPacket(ConfigurationPacket.read(new FriendlyByteBufWrapper(buf))));
+public class FallingTreeConfigPacket implements CustomPacketPayload{
+	public static final CustomPacketPayload.Type<FallingTreeConfigPacket> TYPE = new CustomPacketPayload.Type<>(new ResourceLocation(FallingTree.MOD_ID, "configuration-packet"));
+	public static final StreamCodec<FriendlyByteBuf, FallingTreeConfigPacket> CODEC = CustomPacketPayload.codec(
+			FallingTreeConfigPacket::write,
+			packet -> new FallingTreeConfigPacket(ConfigurationPacket.read(new FriendlyByteBufWrapper(packet))));
 
 	@Getter
 	private final ConfigurationPacket packet;
 
-	@Override
 	public void write(FriendlyByteBuf buf){
 		packet.write(new FriendlyByteBufWrapper(buf));
 	}
 
 	@Override
-	public PacketType<?> getType(){
+	@NotNull
+	public Type<? extends CustomPacketPayload> type(){
 		return TYPE;
 	}
 }

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.daemon=false
 modId=fallingtree
 modName=FallingTree
 includeFabric=true
-includeForge=true
+includeForge=false
 # Repository
 repoUser=Rakambda
 repoName=FallingTree

gradle/libs.versions.toml

@@ -7,16 +7,16 @@ gson-version = "2.10.1"
 log4j2-version = "2.23.1"
 
 # Minecraft / Loaders
-minecraftVersion = "1.20.4"
-fabric-loader-version = "0.15.1"
-fabric-api-version = "0.91.2+1.20.4"
+minecraftVersion = "1.20.5"
+fabric-loader-version = "0.15.10"
+fabric-api-version = "0.97.8+1.20.5"
 forge-version = "1.20.4-49.0.3"
 
 # Mod dependencies
-modmenu-version = "9.0.0-pre.1"
-clothConfigVersion = "13.0.121"
+modmenu-version = "10.0.0-beta.1"
+clothConfigVersion = "14.0.126"
 
-fabric-loom-version = "1.4+"
+fabric-loom-version = "1.6+"
 forge-plugin-version = "[6.0.16,6.2)"
 curse-version = "1.4.0"
 modrinth-version = "2.8.7"

settings.gradle.kts

@@ -22,7 +22,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention").version("0.7.0")
+    id("org.gradle.toolchains.foojay-resolver-convention").version("0.8.0")
 }
 
 val includeFabric: String by settings