Skip to content

Commit 73ba514

Browse files
Circulate233Circulate233
committed
Fix #18
once again :(
1 parent 1da84b7 commit 73ba514

13 files changed

+38
-108
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ dependencies {
227227
implementation(rfg.deobf("curse.maven:thermal-foundation-222880:2926428"))
228228
implementation(rfg.deobf("curse.maven:thermal-expansion-69163:2926431"))
229229
compileOnly(rfg.deobf("curse.maven:industrialcraft-2-242638:3078604"))
230-
implementation(rfg.deobf("curse.maven:mekeng-1027681:5775101"))
231-
implementation(rfg.deobf("curse.maven:mekanism-ce-399904:5351260"))
230+
compileOnly(rfg.deobf("curse.maven:mekanism-ce-399904:5351260"))
231+
compileOnly(rfg.deobf("curse.maven:mekeng-1027681:5775101"))
232232
implementation(rfg.deobf("curse.maven:had-enough-items-557549:7057606"))
233233
implementation(rfg.deobf("curse.maven:thaumic-223628:2629023"))
234234
implementation(rfg.deobf("curse.maven:thaumic-energistics-extended-life-849094:6321322"))

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ show_testing_output = false
1616

1717
# Mod Information
1818
# HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
19-
mod_version = 1.7.12
19+
mod_version = 1.7.13
2020
root_package = com.circulation
2121
mod_id = random_complement
2222
mod_name = RandomComplement

‎src/main/java/com/circulation/random_complement/common/util/MEHandler.java‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import net.minecraftforge.fml.common.Optional;
4242
import net.minecraftforge.fml.relauncher.Side;
4343
import net.minecraftforge.fml.relauncher.SideOnly;
44+
import org.jetbrains.annotations.NotNull;
4445
import org.lwjgl.opengl.GL11;
4546

4647
import java.util.List;
@@ -195,37 +196,43 @@ public static void bindTexture(Minecraft mc, int craftingSlotTextureIndex) {
195196
}
196197

197198
@Optional.Method(modid = "appliedenergistics2")
198-
public static IAEItemStack packItem(Object obj) {
199+
@NotNull
200+
public static ItemStack packItem(Object obj) {
199201
if (obj instanceof ItemStack i) {
200202
if (loadAE2FC && i.getItem() instanceof ItemFluidPacket) {
201-
return AEItemStack.fromItemStack(FakeFluids.packFluid2Drops(FakeItemRegister.getStack(i)));
203+
return FakeFluids.packFluid2Drops(FakeItemRegister.getStack(i));
202204
} else if (loadMEKEng && i.getItem() instanceof ItemGasPacket) {
203-
return AEItemStack.fromItemStack(FakeGases.packGas2Drops(FakeItemRegister.getStack(i)));
205+
return FakeGases.packGas2Drops(FakeItemRegister.getStack(i));
204206
} else {
205-
return AEItemStack.fromItemStack(i);
207+
return i;
206208
}
207209
} else if (loadAE2FC) {
208210
return packAE2FCItem(obj);
209211
}
210-
return null;
212+
return ItemStack.EMPTY;
213+
}
214+
215+
@Optional.Method(modid = "appliedenergistics2")
216+
public static IAEItemStack packAEItem(Object obj) {
217+
return AEItemStack.fromItemStack(packItem(obj));
211218
}
212219

213220
@Optional.Method(modid = "ae2fc")
214-
private static IAEItemStack packAE2FCItem(Object obj) {
221+
private static ItemStack packAE2FCItem(Object obj) {
215222
if (obj instanceof FluidStack i) {
216-
return FakeFluids.packFluid2AEDrops(i);
223+
return FakeFluids.packFluid2Drops(i);
217224
} else if (loadMEKEng) {
218225
return packMEKEngItem(obj);
219226
}
220-
return null;
227+
return ItemStack.EMPTY;
221228
}
222229

223230
@Optional.Method(modid = "mekeng")
224-
private static IAEItemStack packMEKEngItem(Object obj) {
231+
private static ItemStack packMEKEngItem(Object obj) {
225232
if (obj instanceof GasStack i) {
226-
return FakeGases.packGas2AEDrops(i);
233+
return FakeGases.packGas2Drops(i);
227234
}
228-
return null;
235+
return ItemStack.EMPTY;
229236
}
230237

231238
@SideOnly(Side.CLIENT)

‎src/main/java/com/circulation/random_complement/mixin/ae2/gui/MixinAEBaseGui.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private void drawSlotFake(Slot slot, CallbackInfo ci) {
6868
if (slot instanceof SlotFake slotFake) {
6969
var item = slotFake.getDisplayStack();
7070
if (!item.isEmpty()) {
71-
if (r$getCraftablesCache().contains(MEHandler.packItem(item))) {
71+
if (r$getCraftablesCache().contains(MEHandler.packAEItem(item))) {
7272
r$plusSlot.add(slotFake);
7373
}
7474
}

‎src/main/java/com/circulation/random_complement/mixin/ae2/gui/MixinGuiCraftConfirm.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.circulation.random_complement.common.network.ContainerRollBACK;
1616
import com.circulation.random_complement.common.util.AEBookmarkGroup;
1717
import com.google.common.base.Joiner;
18+
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
1819
import mezz.jei.Internal;
1920
import mezz.jei.bookmarks.BookmarkGroup;
2021
import mezz.jei.bookmarks.BookmarkList;
@@ -36,7 +37,6 @@
3637
import org.spongepowered.asm.mixin.injection.Redirect;
3738
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
3839

39-
import java.util.ArrayList;
4040
import java.util.List;
4141

4242
@Mixin(value = GuiCraftConfirm.class, priority = 999)
@@ -56,7 +56,7 @@ public MixinGuiCraftConfirm(Container container) {
5656
@Unique
5757
private static String randomComplement$getItemInformation(final Object o) {
5858
String dspToolTip = "";
59-
List<String> lineList = new ArrayList<>();
59+
List<String> lineList = new ObjectArrayList<>();
6060
if (o == null) {
6161
return "** Null";
6262
}

‎src/main/java/com/circulation/random_complement/mixin/ae2/gui/MixinGuiCraftingCPU.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.circulation.random_complement.common.interfaces.getCraftingCPUCluster;
1616
import com.google.common.base.Joiner;
1717
import com.llamalad7.mixinextras.sugar.Local;
18+
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
1819
import net.minecraft.client.Minecraft;
1920
import net.minecraft.client.gui.FontRenderer;
2021
import net.minecraft.client.resources.I18n;
@@ -33,7 +34,6 @@
3334
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
3435

3536
import java.io.IOException;
36-
import java.util.ArrayList;
3737
import java.util.List;
3838
import java.util.concurrent.TimeUnit;
3939

@@ -55,7 +55,7 @@ public MixinGuiCraftingCPU(Container container) {
5555
@Unique
5656
private static String randomComplement$getItemInformation(final Object o) {
5757
String dspToolTip = "";
58-
List<String> lineList = new ArrayList<>();
58+
List<String> lineList = new ObjectArrayList<>();
5959
if (o == null) {
6060
return "** Null";
6161
}

‎src/main/java/com/circulation/random_complement/mixin/ae2/jei/MixinInputHandler.java‎

Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@
1111
import com.circulation.random_complement.client.handler.RCInputHandler;
1212
import com.circulation.random_complement.client.handler.RCJEIInputHandler;
1313
import com.circulation.random_complement.common.network.KeyBindingHandler;
14-
import com.circulation.random_complement.common.util.Functions;
15-
import com.glodblock.github.common.item.fake.FakeFluids;
16-
import com.glodblock.github.integration.mek.FakeGases;
14+
import com.circulation.random_complement.common.util.MEHandler;
1715
import it.unimi.dsi.fastutil.objects.ObjectLists;
1816
import lombok.val;
19-
import mekanism.api.gas.GasStack;
2017
import mezz.jei.bookmarks.BookmarkItem;
2118
import mezz.jei.bookmarks.BookmarkList;
2219
import mezz.jei.gui.GuiScreenHelper;
@@ -32,8 +29,6 @@
3229
import net.minecraft.client.gui.GuiScreen;
3330
import net.minecraft.item.ItemStack;
3431
import net.minecraftforge.client.event.GuiScreenEvent;
35-
import net.minecraftforge.fluids.FluidStack;
36-
import net.minecraftforge.fml.common.Optional;
3732
import net.minecraftforge.fml.common.eventhandler.EventPriority;
3833
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
3934
import org.lwjgl.input.Keyboard;
@@ -124,15 +119,11 @@ public void onInit(JeiRuntime runtime, IngredientRegistry ingredientRegistry, In
124119
if (isMouse && !Mouse.isButtonDown(m)) {
125120
return true;
126121
}
127-
ItemStack item = ItemStack.EMPTY;
122+
final ItemStack item;
128123
if (ing.getValue() instanceof BookmarkItem<?> book) {
129-
if (book.ingredient instanceof ItemStack i) {
130-
item = i;
131-
}
132-
} else if (ing.getValue() instanceof ItemStack i) {
133-
item = i;
134-
} else if (Functions.modLoaded("ae2fc")) {
135-
item = r$ae2fcWork(ing);
124+
item = MEHandler.packItem(book.ingredient);
125+
} else {
126+
item = MEHandler.packItem(ing);
136127
}
137128
if (item.isEmpty()) return false;
138129
final var oldGui = Minecraft.getMinecraft().currentScreen;
@@ -151,44 +142,4 @@ public void onInit(JeiRuntime runtime, IngredientRegistry ingredientRegistry, In
151142
}
152143
return false;
153144
}
154-
155-
@Unique
156-
@Optional.Method(modid = "ae2fc")
157-
public ItemStack r$ae2fcWork(IClickedIngredient<?> ing) {
158-
if (ing.getValue() instanceof BookmarkItem<?> book) {
159-
if (book.ingredient instanceof FluidStack i) {
160-
var ii = FakeFluids.packFluid2Drops(i);
161-
if (ii != null) {
162-
return ii;
163-
}
164-
}
165-
} else if (ing.getValue() instanceof FluidStack i) {
166-
var ii = FakeFluids.packFluid2Drops(i);
167-
if (ii != null) {
168-
return ii;
169-
}
170-
} else if (Functions.modLoaded("mekeng")) {
171-
return r$mekengWork(ing);
172-
}
173-
return ItemStack.EMPTY;
174-
}
175-
176-
@Unique
177-
@Optional.Method(modid = "mekeng")
178-
private ItemStack r$mekengWork(IClickedIngredient<?> ing) {
179-
if (ing.getValue() instanceof BookmarkItem<?> book) {
180-
if (book.ingredient instanceof GasStack i) {
181-
var ii = FakeGases.packGas2Drops(i);
182-
if (ii != null) {
183-
return ii;
184-
}
185-
}
186-
} else if (ing.getValue() instanceof GasStack i) {
187-
var ii = FakeGases.packGas2Drops(i);
188-
if (ii != null) {
189-
return ii;
190-
}
191-
}
192-
return ItemStack.EMPTY;
193-
}
194145
}

‎src/main/java/com/circulation/random_complement/mixin/ae2/jei/MixinRecipesGui.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private void updateLayout(CallbackInfo ci) {
4646
for (var group : l.getGuiIngredientGroups().values()) {
4747
for (var ingredient : group.getGuiIngredients().values()) {
4848
for (var o : ingredient.getAllIngredients()) {
49-
if (gui.r$getCraftablesCache().contains(MEHandler.packItem(o))) {
49+
if (gui.r$getCraftablesCache().contains(MEHandler.packAEItem(o))) {
5050
final var i = (AccessorGuiIngredient) ingredient;
5151
r$slots.add(
5252
XYPair.of(

‎src/main/java/com/circulation/random_complement/mixin/ae2fc/gui/MixinGuiExtendedFluidPatternTerminal.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ private void drawSlotFake(Slot slot, CallbackInfo ci) {
2424
if (slot instanceof SlotFake slotFake) {
2525
var item = slotFake.getDisplayStack();
2626
if (!item.isEmpty()) {
27-
if (r$getCraftablesCache().contains(MEHandler.packItem(item))) {
27+
if (r$getCraftablesCache().contains(MEHandler.packAEItem(item))) {
2828
r$getPlusSlot().add(slotFake);
2929
}
3030
}

‎src/main/java/com/circulation/random_complement/mixin/ae2fc/gui/MixinGuiFluidPatternTerminal.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ private void drawSlotFake(Slot slot, CallbackInfo ci) {
2424
if (slot instanceof SlotFake slotFake) {
2525
if (!slotFake.getDisplayStack().isEmpty()) {
2626
var item = slotFake.getDisplayStack();
27-
if (r$getCraftablesCache().contains(MEHandler.packItem(item))) {
27+
if (r$getCraftablesCache().contains(MEHandler.packAEItem(item))) {
2828
r$getPlusSlot().add(slot);
2929
}
3030
}

0 commit comments

Comments
 (0)