1.18-pre1

Author: samolego

build.gradle

@@ -2,7 +2,7 @@ import com.modrinth.minotaur.TaskModrinthUpload
 
 
 plugins {
-	id 'fabric-loom' version '0.8-SNAPSHOT'
+	id 'fabric-loom' version '0.10-SNAPSHOT'
 	id 'com.matthewprenger.cursegradle' version '1.4.0'
 	id "com.modrinth.minotaur" version "1.1.0"
 	id 'maven-publish'
@@ -32,14 +32,6 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-	//modRuntime "com.github.CaffeineMC:hydrogen-fabric:mc1.16.5-v0.2.0"
-	modRuntime "com.github.astei:lazydfu:0.1.2"
-	modRuntime 'com.github.samolego.Taterzens:taterzens-fabric:1.3.0'
-
-	//modImplementation 'com.github.jellysquid3:lithium-fabric:1.16.x-0.4.5'
-	//modRuntime "com.github.gnembon:fabric-carpet:master-SNAPSHOT"
-	//modImplementation 'com.github.jellysquid3:cadmium-fabric:1.15.x/dev-SNAPSHOT'
 }
 
 processResources {

gradle.properties

@@ -2,12 +2,12 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-minecraft_version=1.17.1
-yarn_mappings=1.17.1+build.39
-loader_version=0.11.6
+minecraft_version=1.18-pre1
+yarn_mappings=1.18-pre1+build.3
+loader_version=0.12.5
 
 #Fabric api
-fabric_version=0.37.2+1.17
+fabric_version=0.42.2+1.18
 
 # Mod Properties
 mod_version = 0.4.1

src/main/java/org/samo_lego/golfiv/mixin/duplication/ItemStackMixin_SavePatch.java

@@ -0,0 +1,48 @@
+package org.samo_lego.golfiv.mixin.duplication;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import static org.samo_lego.golfiv.GolfIV.golfConfig;
+
+@Mixin(ItemStack.class)
+public abstract class ItemStackMixin_SavePatch {
+    @Shadow public abstract void setCount(int count);
+
+    @Shadow public abstract String getTranslationKey();
+
+    @Shadow public abstract Item getItem();
+
+    @Shadow public abstract int getCount();
+
+    @Inject(method = "writeNbt(Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/nbt/NbtCompound;", at = @At("HEAD"), cancellable = true)
+    private void writeStack(NbtCompound nbt, CallbackInfoReturnable<NbtCompound> cir) {
+        if(golfConfig.duplication.patchItemSave) {
+            System.out.println("Saving " + this.getTranslationKey());
+
+            ItemStack copy = ((ItemStack) (Object) this).copy();
+            this.setCount(0);
+
+            System.out.println("This: " + this.getCount() + " vs copy: " + copy);
+
+            Identifier identifier = Registry.ITEM.getId(copy.getItem());
+            nbt.putString("id", identifier.toString());
+            nbt.putByte("Count", (byte)copy.getCount());
+            if (copy.getNbt() != null) {
+                nbt.put("tag", copy.getNbt().copy());
+            }
+
+            System.out.println(nbt);
+
+            cir.setReturnValue(nbt);
+        }
+    }
+}

src/main/java/org/samo_lego/golfiv/mixin/illegal_actions/ServerPlayNetworkHandlerMixin_MessageCheck.java

@@ -27,12 +27,12 @@ public class ServerPlayNetworkHandlerMixin_MessageCheck {
      * while in nether portals / having GUI open.
      */
     @Inject(
-            method = "onGameMessage(Lnet/minecraft/network/packet/c2s/play/ChatMessageC2SPacket;)V",
+            method = "onChatMessage(Lnet/minecraft/network/packet/c2s/play/ChatMessageC2SPacket;)V",
             at = @At("HEAD"),
             cancellable = true
     )
     private void stopMessageSend(ChatMessageC2SPacket packet, CallbackInfo ci) {
-        if ((golfConfig.main.checkInventoryActions && ((Golfer) player).hasOpenGui()) || (golfConfig.packet.checkPortalHack &&((EntityAccessor) player).inNetherPortal())) {
+        if ((golfConfig.main.checkInventoryActions && ((Golfer) player).hasOpenGui()) || (golfConfig.packet.checkPortalHack && ((EntityAccessor) player).inNetherPortal())) {
             ci.cancel();
         }
     }

src/main/java/org/samo_lego/golfiv/mixin/illegal_items/ServerPlayNetworkHandlerMixin_CreativeItemsCheck.java

@@ -26,7 +26,7 @@ public abstract class ServerPlayNetworkHandlerMixin_CreativeItemsCheck {
             method = "onCreativeInventoryAction(Lnet/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket;)V",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/item/ItemStack;getSubNbt(Ljava/lang/String;)Lnet/minecraft/nbt/NbtCompound;"
+                    target = "Lnet/minecraft/item/BlockItem;getBlockEntityNbt(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/nbt/NbtCompound;"
             )
     )
     private ItemStack checkCreativeItem(ItemStack itemStack) {

src/main/java/org/samo_lego/golfiv/mixin/movement/ServerPlayNetworkHandler_OnGroundCheck.java

@@ -14,6 +14,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.List;
 import java.util.stream.Stream;
 
 import static org.samo_lego.golfiv.GolfIV.golfConfig;
@@ -37,32 +38,31 @@ public class ServerPlayNetworkHandler_OnGroundCheck {
             )
     )
     private void checkOnGround(PlayerMoveC2SPacket packet, CallbackInfo ci) {
-        if(golfConfig.movement.yesFall) {
+        if(golfConfig.movement.yesFall && packet.isOnGround()) {
             Entity bottomEntity = player.getRootVehicle();
             if(bottomEntity == null) {
                 bottomEntity = player;
             }
             final Box bBox = bottomEntity.getBoundingBox().expand(0, 0.25005D, 0).offset(0, packet.getY(player.getY()) - player.getY() - 0.25005D, 0);
 
-            Stream<VoxelShape> collidingBlocks = player.getEntityWorld().getBlockCollisions(bottomEntity, bBox);
-            long blockCollisions = collidingBlocks.count();
+            Iterable<VoxelShape> collidingBlocks = player.getEntityWorld().getBlockCollisions(bottomEntity, bBox);
+            boolean blockCollisions = collidingBlocks.iterator().hasNext();
 
-            if(blockCollisions != 0) {
+            if(blockCollisions) {
                 // Preferring block collisions over entity ones
                 ((Golfer) player).setEntityCollisions(false);
                 ((Golfer) player).setBlockCollisions(true);
             }
             else {
                 Entity finalBottomEntity = bottomEntity;
-                Stream<VoxelShape> collidingEntities = player.getEntityWorld().getEntityCollisions(bottomEntity, bBox, entity -> !finalBottomEntity.equals(entity));
-                long entityCollisions = collidingEntities.count();
+                List<Entity> collidingEntities = player.getEntityWorld().getOtherEntities(bottomEntity, bBox, entity -> !finalBottomEntity.equals(entity));
 
-                ((Golfer) player).setEntityCollisions(entityCollisions != 0);
+                ((Golfer) player).setEntityCollisions(!collidingEntities.isEmpty());
                 ((Golfer) player).setBlockCollisions(false);
             }
 
-            if(!((Golfer) player).isNearGround() && packet.isOnGround()) {
-                // Player isn't on ground packets but client says it is
+            if(!((Golfer) player).isNearGround()) {
+                // Player isn't on ground but client packet says it is
                 ((PlayerMoveC2SPacketAccessor) packet).setOnGround(false);
             }
         }

src/main/java/org/samo_lego/golfiv/storage/GolfConfig.java

@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.annotations.SerializedName;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -170,6 +171,10 @@ public static class Duplication {
         public final String _comment_patchDeathDuplication1 = "// Checks if player is connected before applying damage.";
         public final String _comment_patchDeathDuplication2 = "// Prevents duplicating inventory if player dies after disconnect.";
         public boolean patchDeathDuplication = true;
+
+        @SerializedName("// Whether to set item stack size to 0 after writing it on disk.")
+        public final String _comment_patchItemSave = "";
+        public boolean patchItemSave = true;
     }
 
     /**

src/main/resources/golfiv.mixins.json

@@ -18,6 +18,7 @@
     "accessors.PlaySoundS2CPacketAccessor",
     "accessors.ScreenHandlerSlotUpdateS2CPacketAccessor",
     "duplication.FallingBlockEntityMixin_GravityBlockDupe",
+    "duplication.ItemStackMixin_SavePatch",
     "duplication.ServerPlayerEntityMixin_NoConnectionDeath",
     "duplication.StringTagMixin_StringWriteLimit",
     "illegal_actions.ServerPlayerEntityMixin_InventoryClose",