From 92213031f868f7d7b43e4fb400e389a83dc52c78 Mon Sep 17 00:00:00 2001 From: asdflj <854865755@qq.com> Date: Sun, 5 Feb 2023 18:12:58 +0800 Subject: [PATCH] fix bug --- dependencies.gradle | 10 +++++----- .../java/com/glodblock/github/FluidCraft.java | 4 ++-- .../github/client/gui/base/FCGuiMonitor.java | 5 +++-- .../common/item/ItemWirelessUltraTerminal.java | 5 +++++ .../glodblock/github/loader/RecipeLoader.java | 17 ++++++++++++++++- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index bf0eaec3..dc97a514 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,9 +5,9 @@ dependencies { compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-149-GTNH:dev') compile('curse.maven:cofh-core-69162:2388751') compile('com.github.GTNewHorizons:waila:1.5.22:dev') - compile('com.github.GTNewHorizons:CraftTweaker:3.2.11:dev') - compile('com.github.GTNewHorizons:ExtraCells2:2.5.25:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.9.2:dev") + compileOnly('com.github.GTNewHorizons:CraftTweaker:3.2.11:dev') + compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.25:dev') { transitive = false } + compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.9.2:dev") compileOnly('com.github.GTNewHorizons:ForestryMC:4.5.6:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.49:dev') @@ -15,12 +15,12 @@ dependencies { compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.216:dev') compileOnly('com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev') compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') - compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') + compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly('com.github.GTNewHorizons:AppleCore:3.2.5:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.28:dev') { transitive = false } compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:OpenComputers:1.8.0.5-GTNH:dev') { transitive = false } - compile('com.github.GTNewHorizons:ThaumicEnergistics:1.3.27-GTNH:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.3.27-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:GTplusplus:1.7.191:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:KekzTech:0.6.25:dev') diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index 0360725f..39b06b1b 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -28,7 +28,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; modid = FluidCraft.MODID, version = FluidCraft.VERSION, name = FluidCraft.MODNAME, - dependencies = "required-after:appliedenergistics2;required-after:CoFHCore;after:waila") + dependencies = "required-after:appliedenergistics2;required-after:CoFHCore;after:waila;after:thaumicenergistics;after:ae2wct") public class FluidCraft { public static final String MODID = "GRADLETOKEN_MODID"; @@ -72,7 +72,7 @@ public class FluidCraft { if (!Config.removeRecipe) { RecipeLoader.INSTANCE.run(); } - RecipeLoader.runWCTRecipe(); + RecipeLoader.runTerminalRecipe(); if (ModAndClassUtil.isV2) { CalculatorV2PluginLoader.installCalculatorV2Plugins(); diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java index d7933be3..bd9ed2d8 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java @@ -104,7 +104,8 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui this.configSrc = ((IConfigurableObject) this.inventorySlots).getConfigManager(); (this.monitorableContainer = (FCContainerMonitor) this.inventorySlots).setGui(this); this.viewCell = te instanceof IViewCellStorage; - if (inventoryPlayer.getCurrentItem().getItem() instanceof ItemWirelessUltraTerminal) + if (inventoryPlayer.getCurrentItem() != null + && inventoryPlayer.getCurrentItem().getItem() instanceof ItemWirelessUltraTerminal) this.drawSwitchGuiBtn = true; } @@ -376,7 +377,7 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui false)); this.offsetY += 20; } - if (!(this instanceof GuiEssentiaTerminal)) { + if (ModAndClassUtil.ThE && !(this instanceof GuiEssentiaTerminal)) { this.buttonList.add( this.EssentiaTerminal = new GuiFCImgButton( this.guiLeft - 18, diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java index 3a7d159b..00791fb5 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -93,7 +93,12 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal } if (gui == GuiType.WIRELESS_CRAFTING_TERMINAL) { return new WirelessCraftingTerminalInventory(stack, x, gridNode, player); + } else if (ModAndClassUtil.ThE && gui == GuiType.WIRELESS_ESSENTIA_TERMINAL) { + return new WirelessFluidTerminalInventory(stack, x, gridNode, player); + } else if (gui == GuiType.WIRELESS_FLUID_TERMINAL) { + return new WirelessFluidTerminalInventory(stack, x, gridNode, player); } else { + this.setMode(GuiType.WIRELESS_FLUID_TERMINAL, stack); // set as default mode return new WirelessFluidTerminalInventory(stack, x, gridNode, player); } } diff --git a/src/main/java/com/glodblock/github/loader/RecipeLoader.java b/src/main/java/com/glodblock/github/loader/RecipeLoader.java index 31b323de..d18c4cf6 100644 --- a/src/main/java/com/glodblock/github/loader/RecipeLoader.java +++ b/src/main/java/com/glodblock/github/loader/RecipeLoader.java @@ -4,6 +4,9 @@ import static com.glodblock.github.loader.ItemAndBlockHolder.*; import static net.minecraft.init.Blocks.redstone_torch; import static net.minecraft.init.Items.fish; +import java.util.Arrays; +import java.util.Objects; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -102,6 +105,10 @@ public class RecipeLoader implements Runnable { .findItemStack("appliedenergistics2", "tile.BlockChest", 1); public static final ItemStack AE2_ENERGY_CELL = GameRegistry .findItemStack("appliedenergistics2", "tile.BlockEnergyCell", 1); + public static final ItemStack THE_WIRELESS_TERM = GameRegistry + .findItemStack("thaumicenergistics", "wireless.essentia.terminal", 1); + private static final ItemStack WCT_WIRELESS_TERM = GameRegistry + .findItemStack("ae2wct", "wirelessCraftingTerminal", 1); public static final ItemStack BUCKET = new ItemStack(Items.bucket, 1); public static final ItemStack IRON_BAR = new ItemStack(Blocks.iron_bars, 1); @@ -450,10 +457,18 @@ public class RecipeLoader implements Runnable { } } - public static void runWCTRecipe() { + public static void runTerminalRecipe() { if (ModAndClassUtil.WCT) { GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_PATTERN_TERM.stack())); GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_FLUID_TERM.stack())); + GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_ULTRA_TERM.stack())); } + + ItemStack[] term = { AE2_WIRELESS_TERMINAL, WIRELESS_FLUID_TERM.stack(), WIRELESS_PATTERN_TERM.stack(), + THE_WIRELESS_TERM, WCT_WIRELESS_TERM }; + GameRegistry.addShapelessRecipe( + WIRELESS_ULTRA_TERM.stack(), + Arrays.stream(term).filter(Objects::nonNull).toArray()); + } }