3.5.4

gradle.properties

@@ -7,10 +7,10 @@ bta_version=7.1
 loader_version=0.15.6-babric.4-bta
 
 # HalpLibe
-halplibe_version=3.5.2
+halplibe_version=3.5.4
 dragonfly_version=1.4.7-7.1
 terrain_api_version=1.4.4-7.1
 # Mod
-mod_version=3.3.0
+mod_version=3.4.0
 mod_group=baguchan
 mod_name=better_with_aquatic

src/main/java/baguchan/better_with_aquatic/crafting/ModCraftings.java

@@ -26,7 +26,6 @@ public void onRecipesReady() {
 
 	@Override
 	public void initNamespaces() {
-		RecipeEntrypoint.super.initNamespaces();
 		RecipeBuilder.initNameSpace(MOD_ID);
 	}
 }

src/main/java/baguchan/better_with_aquatic/mixin/EntityPlayerMixin.java

@@ -11,13 +11,17 @@
 import net.minecraft.core.util.helper.MathHelper;
 import net.minecraft.core.world.World;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = EntityPlayer.class, remap = false)
 public abstract class EntityPlayerMixin extends EntityLiving implements ISwiming {
+	@Shadow
+	protected abstract void resetHeight();
+
 	@Unique
 	public boolean swimming;
 	@Unique
@@ -38,8 +42,7 @@ public void setSwimming(boolean p_20274_) {
 			this.setPos(this.x, this.y - 1.2, this.z);
 		} else if (!p_20274_ && this.swimming) {
 			this.setSize(0.6F, 1.8F);
-
-			this.heightOffset = 1.62f;
+			this.resetHeight();
 			this.setPos(this.x, this.y + 1.2F, this.z);
 		}
 		this.swimming = p_20274_;

src/main/java/baguchan/better_with_aquatic/mixin/client/EntityClientPlayerMPMixin.java

@@ -7,7 +7,6 @@
 import net.minecraft.client.entity.player.EntityPlayerSP;
 import net.minecraft.client.net.handler.NetClientHandler;
 import net.minecraft.core.player.Session;
-import net.minecraft.core.util.phys.AABB;
 import net.minecraft.core.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
@@ -19,11 +18,6 @@
 public abstract class EntityClientPlayerMPMixin extends EntityPlayerSP implements ISwiming {
 	@Unique
 	public boolean swimmingOld;
-	@Unique
-	public AABB oldAABB;
-	public float oldOffset;
-	public float oldWidth;
-	public float oldHeight;
 
 	public EntityClientPlayerMPMixin(Minecraft minecraft, World world, Session session, NetClientHandler netclienthandler) {
 		super(minecraft, world, session, 0);
@@ -32,9 +26,10 @@ public EntityClientPlayerMPMixin(Minecraft minecraft, World world, Session sessi
 	@Inject(method = "func_4056_N", at = @At("HEAD"))
 	public void func_4056_N(CallbackInfo callbackInfo) {
 		if (this.isSwimming() != this.swimmingOld) {
-			this.swimmingOld = this.isSwimming();
 			EntityClientPlayerMP clientPlayerMP = (EntityClientPlayerMP) (Object) this;
 			clientPlayerMP.sendQueue.addToSendQueue(new SwimPacket(this.isSwimming()));
+
+			this.swimmingOld = this.isSwimming();
 		}
 	}