Fix Primitive Crafting exploit

build.gradle

@@ -36,7 +36,7 @@ targetCompatibility = 1.8
 
 group = "io.github.lxgaming"
 archivesBaseName = "Sledgehammer"
-version = "1.12.2-2.0.5"
+version = "1.12.2-2.0.6"
 
 minecraft {
     version = "1.12.2-14.23.5.2838"
@@ -128,6 +128,7 @@ dependencies {
     }
     provided("natures-aura:NaturesAura:26.0")
     provided("primalcore:PrimalCore:1.12.2:0.6.105")
+    provided("primitive-crafting:PrimitiveCrafting:1.12.2:1.4.0")
     provided("primitive-mobs:primitivemobs:1.2.3a")
     provided("pyrotech:pyrotech:1.12.2:1.3.13")
     provided("quark:Quark:r1.5:145")
@@ -177,6 +178,7 @@ jar {
                         + "mixins.sledgehammer.morph.json,"
                         + "mixins.sledgehammer.naturesaura.json,"
                         + "mixins.sledgehammer.platform.json,"
+                        + "mixins.sledgehammer.primitivecrafting.json,"
                         + "mixins.sledgehammer.primitivemobs.json,"
                         + "mixins.sledgehammer.projectred.json,"
                         + "mixins.sledgehammer.pyrotech.json,"

src/main/java/io/github/lxgaming/sledgehammer/configuration/category/MixinCategory.java

@@ -34,6 +34,7 @@
 import io.github.lxgaming.sledgehammer.configuration.category.mixin.MatterOverdriveMixinCategory;
 import io.github.lxgaming.sledgehammer.configuration.category.mixin.MorphMixinCategory;
 import io.github.lxgaming.sledgehammer.configuration.category.mixin.NaturesAuraMixinCategory;
+import io.github.lxgaming.sledgehammer.configuration.category.mixin.PrimitiveCraftingMixinCategory;
 import io.github.lxgaming.sledgehammer.configuration.category.mixin.PrimitiveMobsMixinCategory;
 import io.github.lxgaming.sledgehammer.configuration.category.mixin.ProjectRedMixinCategory;
 import io.github.lxgaming.sledgehammer.configuration.category.mixin.PyrotechMixinCategory;
@@ -108,6 +109,9 @@ public class MixinCategory {
     @Setting(value = "naturesaura", comment = "Nature's Aura")
     private NaturesAuraMixinCategory naturesAuraMixinCategory = new NaturesAuraMixinCategory();
 
+    @Setting(value = "primitivecrafting", comment = "Primitive Crafting")
+    private PrimitiveCraftingMixinCategory primitiveCraftingMixinCategory = new PrimitiveCraftingMixinCategory();
+
     @Setting(value = "primitive-mobs", comment = "Primitive Mobs")
     private PrimitiveMobsMixinCategory primitiveMobsMixinCategory = new PrimitiveMobsMixinCategory();
 
@@ -222,6 +226,10 @@ public NaturesAuraMixinCategory getNaturesAuraMixinCategory() {
         return naturesAuraMixinCategory;
     }
 
+    public PrimitiveCraftingMixinCategory getPrimitiveCraftingMixinCategory() {
+        return primitiveCraftingMixinCategory;
+    }
+
     public PrimitiveMobsMixinCategory getPrimitiveMobsMixinCategory() {
         return primitiveMobsMixinCategory;
     }

src/main/java/io/github/lxgaming/sledgehammer/configuration/category/mixin/PrimitiveCraftingMixinCategory.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020 Alex Thomson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.github.lxgaming.sledgehammer.configuration.category.mixin;
+
+import io.github.lxgaming.sledgehammer.configuration.annotation.Mapping;
+import ninja.leaping.configurate.objectmapping.Setting;
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class PrimitiveCraftingMixinCategory {
+
+    @Mapping(value = "primitivecrafting.common.crafting.PrimitiveRecipeMixin", dependencies = {"primitivecrafting"})
+    @Mapping(value = "primitivecrafting.network.AddItemMixin", dependencies = {"primitivecrafting"})
+    @Setting(value = "packet-exploit", comment = "If 'true', fixes item spawn packet exploit.")
+    private boolean packetExploit = false;
+
+    public boolean isPacketExploit() {
+        return packetExploit;
+    }
+}

src/main/java/io/github/lxgaming/sledgehammer/mixin/primitivecrafting/common/crafting/PrimitiveRecipeMixin.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2020 Alex Thomson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.github.lxgaming.sledgehammer.mixin.primitivecrafting.common.crafting;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+import tschipp.primitivecrafting.common.crafting.PrimitiveRecipe;
+
+@Mixin(value = PrimitiveRecipe.class, remap = false)
+public abstract class PrimitiveRecipeMixin {
+
+    /**
+     * @author LX_Gaming
+     * @reason Re-implement Logic.
+     */
+    @Overwrite
+    public static void addItem(EntityPlayer player, ItemStack stack) {
+        if (player != null && !player.world.isRemote) {
+            if (!player.inventory.addItemStackToInventory(stack)) {
+                player.dropItem(stack, false);
+            }
+        }
+    }
+}

src/main/java/io/github/lxgaming/sledgehammer/mixin/primitivecrafting/network/AddItemMixin.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2020 Alex Thomson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.github.lxgaming.sledgehammer.mixin.primitivecrafting.network;
+
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import tschipp.primitivecrafting.network.AddItem;
+
+@Mixin(value = AddItem.class, remap = false)
+public abstract class AddItemMixin {
+
+    /**
+     * Woop-woop! That's the sound of da police! That's the sound of the beast!
+     */
+    @Inject(
+            method = "onMessage",
+            at = @At(
+                    value = "HEAD"
+            ),
+            cancellable = true
+    )
+    private void onMessage(AddItem message, MessageContext ctx, CallbackInfoReturnable<IMessage> callbackInfoReturnable) {
+        callbackInfoReturnable.setReturnValue(null);
+    }
+}

src/main/resources/mixins.sledgehammer.primitivecrafting.json

@@ -0,0 +1,16 @@
+{
+  "required": false,
+  "minVersion": "0.7.10",
+  "package": "io.github.lxgaming.sledgehammer.mixin.primitivecrafting",
+  "refmap": "mixins.sledgehammer.refmap.json",
+  "plugin": "io.github.lxgaming.sledgehammer.mixin.plugin.CorePlugin",
+  "target": "@env(DEFAULT)",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [
+    "common.crafting.PrimitiveRecipeMixin",
+    "network.AddItemMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}