Updating the way crafts were blocked -> More clean + stable

Author: PolarFox27

build.gradle

@@ -21,6 +21,7 @@ println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getPro
 
 minecraft {
     mappings channel: 'official', version: '1.16.5'
+    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
     runs {
         client {
             workingDirectory project.file('run')

gradle.properties

@@ -2,4 +2,4 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-mod_version=1.16.5-3.0.2
+mod_version=1.16.5-3.1.0.0

src/main/java/net/polarfox27/jobs/containers/BlockingCraftingResultContainer.java

@@ -0,0 +1,26 @@
+package net.polarfox27.jobs.containers;
+
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.inventory.CraftResultInventory;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.world.World;
+import net.polarfox27.jobs.data.ServerJobsData;
+import net.polarfox27.jobs.data.capabilities.PlayerData;
+import net.polarfox27.jobs.data.capabilities.PlayerJobs;
+
+public class BlockingCraftingResultContainer extends CraftResultInventory {
+
+
+    @Override
+    public boolean setRecipeUsed(World world, ServerPlayerEntity player, IRecipe<?> recipe) {
+        if(!super.setRecipeUsed(world, player, recipe))
+            return false;
+
+        PlayerJobs jobs = PlayerData.getPlayerJobs(player);
+        if(ServerJobsData.BLOCKED_CRAFTS.isBlocked(jobs, recipe.getResultItem())){
+            this.setRecipeUsed(null);
+            return false;
+        }
+        return true;
+    }
+}

src/main/java/net/polarfox27/jobs/events/CommonEvents.java

@@ -16,6 +16,7 @@
 import net.polarfox27.jobs.data.ServerJobsData;
 import net.polarfox27.jobs.data.capabilities.PlayerData;
 import net.polarfox27.jobs.data.capabilities.PlayerJobs;
+import net.polarfox27.jobs.events.server.ContainerEvents;
 import net.polarfox27.jobs.network.PacketAskClientUpdate;
 import net.polarfox27.jobs.util.handler.PacketHandler;
 
@@ -69,7 +70,10 @@ public void onEntityCloned(PlayerEvent.Clone event) {
 	public void onPlayerJoinedServer(EntityJoinWorldEvent event){
 		if(!(event.getEntity() instanceof ServerPlayerEntity))
 			return;
+		ServerPlayerEntity player = (ServerPlayerEntity)event.getEntity();
 		ServerJobsData.sendDataToClient((ServerPlayerEntity)event.getEntity());
+		if(player.gameMode.isSurvival())
+			ContainerEvents.changePlayerInventoryCraftingSlot(player);
 	}
 
 	/**

src/main/java/net/polarfox27/jobs/events/client/GuiEvents.java

@@ -2,26 +2,14 @@
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.datafixers.util.Pair;
-import net.minecraft.block.Blocks;
 import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.Container;
-import net.minecraft.inventory.container.INamedContainerProvider;
-import net.minecraft.util.IWorldPosCallable;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent.RightClickBlock;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.polarfox27.jobs.data.ClientJobsData;
 import net.polarfox27.jobs.gui.GuiGainXP;
-import net.polarfox27.jobs.gui.containers.ContainerCraft;
 
 @EventBusSubscriber
 public class GuiEvents {
@@ -46,40 +34,4 @@ public void clientTick(RenderGameOverlayEvent e) {
             gui.render(new MatrixStack());
         }
     }
-
-    /**
-     * Cancels the opening of the regular crafting interface and opens the custom one from the Jobs mod.
-     * @param e the Click Event
-     */
-    @SubscribeEvent
-    public void onOpenCraftingTable(RightClickBlock e) {
-        if(e.getWorld().getBlockState(e.getPos()).getBlock() == Blocks.CRAFTING_TABLE) {
-            e.setCanceled(true);
-            if(!e.getWorld().isClientSide) {
-                openUpdatedCraftingTable(e.getPlayer(), e.getWorld(), e.getPos());
-            }
-        }
-    }
-
-
-    /**
-     * Opens the custom crafting interface of the Jobs mod.
-     * @param player the player opening the interface
-     * @param world the current world
-     * @param pos the position of the crafting table
-     */
-    private void openUpdatedCraftingTable(PlayerEntity player, World world, BlockPos pos){
-        player.openMenu(new INamedContainerProvider() {
-
-            @Override
-            public Container createMenu(int index, PlayerInventory inventory, PlayerEntity player) {
-                return new ContainerCraft(index, inventory, IWorldPosCallable.create(world, pos));
-            }
-
-            @Override
-            public ITextComponent getDisplayName() {
-                return new TranslationTextComponent("container.crafting");
-            }
-        });
-    }
 }

src/main/java/net/polarfox27/jobs/events/server/BlockInteractionEvents.java

@@ -4,6 +4,8 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.CropsBlock;
 import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.BlockEvent.BreakEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
@@ -49,6 +51,23 @@ public void onBreakOreOrCrop(BreakEvent event) {
             if(xp2 > 0)
                 jobs.gainXP(job, xp2, player);
         }
+    }
 
+    /**
+     * Fired when a player right-clicks a block. If the player can't right-click using the item, event is canceled.
+     * @param event the right click event.
+     */
+    @SubscribeEvent
+    public void onRightClickBlock(PlayerInteractEvent.RightClickBlock event){
+        if(event.getWorld().isClientSide() || !(event.getPlayer() instanceof ServerPlayerEntity))
+            return;
+        ServerPlayerEntity player = (ServerPlayerEntity)event.getPlayer();
+        PlayerJobs jobs = PlayerData.getPlayerJobs(player);
+
+        ItemStack stack = player.getMainHandItem() == ItemStack.EMPTY ? player.getOffhandItem() :
+                player.getMainHandItem();
+
+        if(stack != ItemStack.EMPTY && ServerJobsData.BLOCKED_RIGHT_CLICKS.isBlocked(PlayerData.getPlayerJobs(player), stack))
+            event.setCanceled(true);
     }
 }

src/main/java/net/polarfox27/jobs/events/server/ContainerEvents.java

@@ -0,0 +1,47 @@
+package net.polarfox27.jobs.events.server;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.container.CraftingResultSlot;
+import net.minecraft.inventory.container.PlayerContainer;
+import net.minecraft.inventory.container.WorkbenchContainer;
+import net.minecraftforge.event.entity.player.PlayerContainerEvent;
+import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.polarfox27.jobs.containers.BlockingCraftingResultContainer;
+
+public class ContainerEvents {
+
+    /**
+     * Modify the crafting container when opened to block certain crafts.
+     * @param e the Container opened event
+     */
+    @SubscribeEvent
+    public void onCraftingMenuOpened(PlayerContainerEvent.Open e) {
+        if(e.getContainer() instanceof WorkbenchContainer){
+            WorkbenchContainer container = (WorkbenchContainer)e.getContainer();
+            container.resultSlots = new BlockingCraftingResultContainer();
+            container.slots.set(0, new CraftingResultSlot(e.getPlayer(), container.craftSlots, container.resultSlots, 0, 124, 35));
+        }
+    }
+
+    /**
+     * When the player is in Survival, modify the inventory to block certain crafts.
+     * @param e the Click Event
+     */
+    @SubscribeEvent
+    public void onPlayerInventoryOpened(PlayerEvent.PlayerChangeGameModeEvent e) {
+        if(e.getNewGameMode().isSurvival()){
+            changePlayerInventoryCraftingSlot(e.getPlayer());
+        }
+    }
+
+    /**
+     * Modifies the player inventory to block crafts according to the Jobs.
+     * @param player the player from whom the inventory is modified.
+     */
+    public static void changePlayerInventoryCraftingSlot(PlayerEntity player){
+        PlayerContainer container = player.inventoryMenu;
+        container.resultSlots = new BlockingCraftingResultContainer();
+        container.slots.set(0, new CraftingResultSlot(player, container.getCraftSlots(), container.resultSlots, 0, 124, 35));
+    }
+}