Skip to content

Commit 43d1539

Browse files
committed
对物品莫名其妙变多的修复尝试...
1 parent 5760afc commit 43d1539

6 files changed

Lines changed: 6 additions & 16 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ mixin_refmap = mixins.${mod_id}.refmap.json
115115
# Only make a coremod if you are absolutely sure of what you are doing
116116
# Change the property `coremod_includes_mod` to false if your coremod doesn't have a @Mod annotation
117117
# You MUST state a class name for `coremod_plugin_class_name` if you are making a coremod, the class should implement `IFMLLoadingPlugin`
118-
is_coremod = false
118+
is_coremod = true
119119
coremod_includes_mod = true
120120
coremod_plugin_class_name = com.glodblock.github.coremod.FCCoreMod
121121

src/main/java/com/glodblock/github/coremod/CoreModHooks.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@
7070
@SuppressWarnings("unused")
7171
public class CoreModHooks {
7272

73-
public static InventoryCrafting wrapCraftingBuffer(final InventoryCrafting inv) {
74-
final int s = inv.getWidth() > 3 ? 10 : 3;
75-
return new FluidConvertingInventoryCrafting(Ae2Reflect.getCraftContainer(inv), s, s);
76-
}
77-
7873
public static InventoryCrafting wrapCraftingBuffer(final Container container, final int width, final int height) {
7974
final int s = width > 3 ? 10 : 3;
8075
return new FluidConvertingInventoryCrafting(container, width, height);

src/main/java/com/glodblock/github/coremod/FCCoreMod.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ public class FCCoreMod implements IFMLLoadingPlugin, IEarlyMixinLoader {
1818

1919
private static final Map<String, BooleanSupplier> MIXIN_CONFIGS = new Object2ObjectLinkedOpenHashMap<>();
2020

21+
{
22+
addMixinCFG("mixins.ae2fc.json");
23+
}
24+
2125
@Nullable
2226
@Override
2327
public String getModContainerClass() {

src/main/java/com/glodblock/github/coremod/LateMixinLoader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public class LateMixinLoader implements ILateMixinLoader {
1616
private static final Map<String, BooleanSupplier> MIXIN_CONFIGS = new Object2ObjectLinkedOpenHashMap<>();
1717

1818
static {
19-
addMixinCFG("mixins.ae2fc.json");
2019
addMixinCFG("mixins.ae2fc.packagedauto.json", () -> Loader.isModLoaded("packagedauto"));
2120
addMixinCFG("mixins.ae2fc.jei.json", () -> Loader.isModLoaded("jei"));
2221
addMixinCFG("mixins.ae2fc.wct.json", () -> Loader.isModLoaded("wct"));

src/main/java/com/glodblock/github/util/Ae2Reflect.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import appeng.util.inv.ItemSlot;
1313
import appeng.util.inv.filter.IAEItemFilter;
1414
import com.mekeng.github.common.me.duality.impl.DualityGasInterface;
15-
import net.minecraft.inventory.Container;
16-
import net.minecraft.inventory.InventoryCrafting;
1715
import net.minecraft.world.World;
1816

1917
import java.lang.invoke.MethodHandle;
@@ -24,11 +22,11 @@
2422
import java.util.Arrays;
2523
import java.util.Map;
2624

25+
@SuppressWarnings("unchecked")
2726
public class Ae2Reflect {
2827

2928
private static final MethodHandle mItemSlot_setExtractable;
3029
private static final MethodHandle fGetDisassembleRecipe_nonCellMappings;
31-
private static final MethodHandle fGetInventory_container;
3230
private static final MethodHandle fGetDualInterface_gridProxy;
3331
private static final MethodHandle fGetDualityFluidInterface_gridProxy;
3432
private static final MethodHandle fGetAppEngInternalInventory_filter;
@@ -42,7 +40,6 @@ public class Ae2Reflect {
4240
static {
4341
try {
4442
mItemSlot_setExtractable = reflectMethodHandle(ItemSlot.class, "setExtractable", boolean.class);
45-
fGetInventory_container = reflectFieldGetter(InventoryCrafting.class, "eventHandler", "field_70465_c", "c");
4643
fGetDisassembleRecipe_nonCellMappings = reflectFieldGetter(DisassembleRecipe.class, "nonCellMappings");
4744
fGetDualInterface_gridProxy = reflectFieldGetter(DualityInterface.class, "gridProxy");
4845
fGetDualityFluidInterface_gridProxy = reflectFieldGetter(DualityFluidInterface.class, "gridProxy");
@@ -160,10 +157,6 @@ public static void writeField(final Object owner, final MethodHandle field, fina
160157
}
161158
}
162159

163-
public static Container getCraftContainer(final InventoryCrafting inv) {
164-
return Ae2Reflect.readField(inv, fGetInventory_container);
165-
}
166-
167160
public static void setItemSlotExtractable(final ItemSlot slot, final boolean extractable) {
168161
try {
169162
mItemSlot_setExtractable.invoke(slot, extractable);

src/main/resources/META-INF/ae2fc_at.cfg

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)