Skip to content

Commit f1953dd

Browse files
committed
Cleanup codebase
1 parent c4e4b78 commit f1953dd

4 files changed

Lines changed: 7 additions & 16 deletions

File tree

src/main/java/tfar/fastbench/MixinHooks.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import tfar.fastbench.interfaces.CraftingInventoryDuck;
3939
import tfar.fastbench.mixin.ContainerAccessor;
4040

41-
public class MixinHooks {
41+
public final class MixinHooks {
4242

4343
public static boolean hascachedrecipe = false;
4444

src/main/java/tfar/fastbench/mixin/CraftingContainerMixin.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,14 @@
3030
import net.minecraft.world.Container;
3131
import net.minecraft.world.inventory.AbstractContainerMenu;
3232
import net.minecraft.world.inventory.TransientCraftingContainer;
33-
import org.spongepowered.asm.mixin.Final;
3433
import org.spongepowered.asm.mixin.Mixin;
35-
import org.spongepowered.asm.mixin.Shadow;
3634
import org.spongepowered.asm.mixin.Unique;
3735
import org.spongepowered.asm.mixin.injection.At;
3836
import tfar.fastbench.interfaces.CraftingInventoryDuck;
3937

4038
@Mixin(TransientCraftingContainer.class)
4139
public class CraftingContainerMixin implements CraftingInventoryDuck {
4240

43-
@Shadow
44-
@Final
45-
private AbstractContainerMenu menu;
4641
@Unique
4742
public boolean checkMatrixChanges = true;
4843

src/main/java/tfar/fastbench/mixin/CraftingMenuMixin.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import net.minecraft.world.Container;
3030
import net.minecraft.world.entity.player.Player;
3131
import net.minecraft.world.inventory.AbstractContainerMenu;
32-
import net.minecraft.world.inventory.ContainerLevelAccess;
3332
import net.minecraft.world.inventory.CraftingContainer;
3433
import net.minecraft.world.inventory.CraftingMenu;
3534
import net.minecraft.world.inventory.MenuType;
@@ -58,13 +57,6 @@ abstract class CraftingMenuMixin<C extends Container> extends RecipeBookMenu<C>
5857
@Shadow
5958
@Final
6059
private ResultContainer resultSlots;
61-
@Shadow
62-
@Final
63-
private Player player;
64-
65-
@Shadow
66-
@Final
67-
private ContainerLevelAccess access;
6860

6961
protected CraftingMenuMixin(@Nullable MenuType<?> type, int syncId) {
7062
super(type, syncId);

src/main/java/tfar/fastbench/mixin/PlayerContainerMixin.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@
2929

3030
import net.minecraft.world.Container;
3131
import net.minecraft.world.entity.player.Player;
32-
import net.minecraft.world.inventory.*;
32+
import net.minecraft.world.inventory.AbstractContainerMenu;
33+
import net.minecraft.world.inventory.CraftingContainer;
34+
import net.minecraft.world.inventory.InventoryMenu;
35+
import net.minecraft.world.inventory.MenuType;
36+
import net.minecraft.world.inventory.ResultContainer;
3337
import net.minecraft.world.item.ItemStack;
3438
import org.jetbrains.annotations.Nullable;
3539
import org.spongepowered.asm.mixin.Final;
@@ -55,7 +59,7 @@ abstract class PlayerContainerMixin extends AbstractContainerMenu implements Cra
5559
@Final
5660
private ResultContainer resultSlots;
5761

58-
@Inject(method = "slotsChanged", at = @At("HEAD"), cancellable = true)
62+
@Inject(method = "slotsChanged", at = @At("HEAD"))
5963
private void updateResult(Container inventory, CallbackInfo ci) {
6064
MixinHooks.slotChangedCraftingGrid(owner.level(), craftSlots, resultSlots);
6165
}

0 commit comments

Comments
 (0)