diff options
Diffstat (limited to 'src/main/java/goodgenerator')
5 files changed, 38 insertions, 77 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java index 9d85548818..d8057832cc 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java @@ -15,23 +15,12 @@ import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.IGridProxyable; import appeng.tile.TileEvent; import appeng.tile.events.TileEventType; -import cpw.mods.fml.common.Optional; import goodgenerator.util.ItemRefer; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumicenergistics.api.grid.IEssentiaGrid; import thaumicenergistics.api.grid.IMEEssentiaMonitor; -@Optional.InterfaceList( - value = { - @Optional.Interface( - iface = "appeng.api.networking.security.IActionHost", - modid = "appliedenergistics2", - striprefs = true), - @Optional.Interface( - iface = "appeng.me.helpers.IGridProxyable", - modid = "appliedenergistics2", - striprefs = true), }) public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActionHost, IGridProxyable { private AENetworkProxy gridProxy = null; @@ -57,53 +46,45 @@ public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActi } @TileEvent(TileEventType.WORLD_NBT_READ) - @Optional.Method(modid = "appliedenergistics2") public void readFromNBT_AENetwork(final NBTTagCompound data) { AENetworkProxy gp = getProxy(); if (gp != null) getProxy().readFromNBT(data); } @TileEvent(TileEventType.WORLD_NBT_WRITE) - @Optional.Method(modid = "appliedenergistics2") public void writeToNBT_AENetwork(final NBTTagCompound data) { AENetworkProxy gp = getProxy(); if (gp != null) gp.writeToNBT(data); } - @Optional.Method(modid = "appliedenergistics2") void onChunkUnloadAE() { AENetworkProxy gp = getProxy(); if (gp != null) gp.onChunkUnload(); } - @Optional.Method(modid = "appliedenergistics2") void invalidateAE() { AENetworkProxy gp = getProxy(); if (gp != null) gp.invalidate(); } - @Optional.Method(modid = "appliedenergistics2") + @Override public IGridNode getGridNode(ForgeDirection forgeDirection) { AENetworkProxy gp = getProxy(); return gp != null ? gp.getNode() : null; } @Override - @Optional.Method(modid = "appliedenergistics2") public void gridChanged() {} @Override - @Optional.Method(modid = "appliedenergistics2") public AECableType getCableConnectionType(ForgeDirection forgeDirection) { return AECableType.SMART; } @Override - @Optional.Method(modid = "appliedenergistics2") public void securityBreak() {} @Override - @Optional.Method(modid = "appliedenergistics2") public AENetworkProxy getProxy() { if (gridProxy == null) { gridProxy = new AENetworkProxy(this, "proxy", ItemRefer.Essentia_Output_Hatch_ME.get(1), true); @@ -114,13 +95,11 @@ public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActi } @Override - @Optional.Method(modid = "appliedenergistics2") public DimensionalCoord getLocation() { return new DimensionalCoord(this.worldObj, this.xCoord, this.yCoord, this.zCoord); } @Override - @Optional.Method(modid = "appliedenergistics2") public IGridNode getActionableNode() { AENetworkProxy gp = getProxy(); return gp != null ? gp.getNode() : null; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java index 0d7d418447..a85dea7aae 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java @@ -32,10 +32,9 @@ import appeng.api.util.AECableType; import appeng.api.util.DimensionalCoord; import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.IGridProxyable; -import cpw.mods.fml.common.Optional; -import extracells.util.FluidUtil; import goodgenerator.blocks.tileEntity.YottaFluidTank; import goodgenerator.loader.Loaders; +import goodgenerator.util.StackUtils; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; @@ -45,28 +44,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Utility; -@Optional.InterfaceList( - value = { - @Optional.Interface( - iface = "appeng.api.networking.security.IActionHost", - modid = "appliedenergistics2", - striprefs = true), - @Optional.Interface( - iface = "appeng.me.helpers.IGridProxyable", - modid = "appliedenergistics2", - striprefs = true), - @Optional.Interface( - iface = "appeng.api.storage.IMEInventory", - modid = "appliedenergistics2", - striprefs = true), - @Optional.Interface( - iface = "appeng.api.storage.IMEInventoryHandler", - modid = "appliedenergistics2", - striprefs = true), - @Optional.Interface( - iface = "appeng.api.storage.ICellContainer", - modid = "appliedenergistics2", - striprefs = true), }) public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyable, IActionHost, ICellContainer, IMEInventory<IAEFluidStack>, IMEInventoryHandler<IAEFluidStack> { @@ -144,23 +121,21 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl return true; } - @Optional.Method(modid = "appliedenergistics2") + @Override public IGridNode getGridNode(ForgeDirection forgeDirection) { AENetworkProxy gp = getProxy(); return gp != null ? gp.getNode() : null; } @Override - @Optional.Method(modid = "appliedenergistics2") public AECableType getCableConnectionType(ForgeDirection forgeDirection) { return AECableType.SMART; } - @Optional.Method(modid = "appliedenergistics2") + @Override public void securityBreak() {} @Override - @Optional.Method(modid = "appliedenergistics2") public AENetworkProxy getProxy() { if (gridProxy == null) { gridProxy = new AENetworkProxy(this, "proxy", Loaders.YFH, true); @@ -171,14 +146,12 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl } @Override - @Optional.Method(modid = "appliedenergistics2") public DimensionalCoord getLocation() { IGregTechTileEntity gtm = this.getBaseMetaTileEntity(); return new DimensionalCoord(gtm.getWorld(), gtm.getXCoord(), gtm.getYCoord(), gtm.getZCoord()); } @Override - @Optional.Method(modid = "appliedenergistics2") public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out) { if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) return out; @@ -189,12 +162,11 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl if (host.mStorageCurrent.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0) { ready = Long.MAX_VALUE; } else ready = host.mStorageCurrent.longValue(); - out.add(FluidUtil.createAEFluidStack(FluidRegistry.getFluid(host.mFluidName), ready)); + out.add(StackUtils.createAEFluidStack(FluidRegistry.getFluid(host.mFluidName), ready)); return out; } @Override - @Optional.Method(modid = "appliedenergistics2") public IAEFluidStack injectItems(IAEFluidStack input, Actionable type, BaseActionSource src) { long amt = fill(null, input, false); if (amt == input.getStackSize()) { @@ -205,7 +177,6 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl } @Override - @Optional.Method(modid = "appliedenergistics2") public IAEFluidStack extractItems(IAEFluidStack request, Actionable mode, BaseActionSource src) { IAEFluidStack ready = drain(null, request, false); if (ready != null) { @@ -215,7 +186,6 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl } @Override - @Optional.Method(modid = "appliedenergistics2") public StorageChannel getChannel() { return StorageChannel.FLUIDS; } @@ -393,33 +363,28 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl } @Override - @Optional.Method(modid = "appliedenergistics2") public IGridNode getActionableNode() { AENetworkProxy gp = getProxy(); return gp != null ? gp.getNode() : null; } @Override - @Optional.Method(modid = "appliedenergistics2") public AccessRestriction getAccess() { return this.readMode; } @Override - @Optional.Method(modid = "appliedenergistics2") public boolean isPrioritized(IAEFluidStack input) { return true; } @Override - @Optional.Method(modid = "appliedenergistics2") public boolean canAccept(IAEFluidStack input) { FluidStack rInput = input.getFluidStack(); return fill(null, rInput, false) > 0; } @Override - @Optional.Method(modid = "appliedenergistics2") public List<IMEInventoryHandler> getCellArray(StorageChannel channel) { List<IMEInventoryHandler> list = new ArrayList<>(); if (channel == StorageChannel.FLUIDS) { @@ -429,19 +394,16 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl } @Override - @Optional.Method(modid = "appliedenergistics2") public int getPriority() { return this.priority; } @Override - @Optional.Method(modid = "appliedenergistics2") public int getSlot() { return 0; } @Override - @Optional.Method(modid = "appliedenergistics2") public boolean validForPass(int i) { return true; } diff --git a/src/main/java/goodgenerator/crossmod/LoadedList.java b/src/main/java/goodgenerator/crossmod/LoadedList.java index 13e0ca38f5..5e8fc9cab3 100644 --- a/src/main/java/goodgenerator/crossmod/LoadedList.java +++ b/src/main/java/goodgenerator/crossmod/LoadedList.java @@ -7,7 +7,6 @@ public class LoadedList { public static boolean GTPP; public static boolean GTNH_CORE; public static boolean BOTDUSTRIES; - public static boolean EXTRA_CELLS; public static boolean THAUMIC_BASES; public static boolean THAUMIC_TINKERER; public static boolean AUTOMAGY; @@ -18,7 +17,6 @@ public class LoadedList { GTPP = Loader.isModLoaded("miscutils"); GTNH_CORE = Loader.isModLoaded("dreamcraft"); BOTDUSTRIES = Loader.isModLoaded("botdustries"); - EXTRA_CELLS = Loader.isModLoaded("extracells"); THAUMIC_BASES = Loader.isModLoaded("thaumicbases"); THAUMIC_TINKERER = Loader.isModLoaded("ThaumicTinkerer"); AUTOMAGY = Loader.isModLoaded("Automagy"); diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index f0d20aefd8..6ee9c89e49 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -187,17 +187,15 @@ public class RecipeLoader_02 { GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 1), 'C', ItemRefer.YOTTank_Casing.get(1) }); - if (LoadedList.EXTRA_CELLS) { - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.Hatch_Output_IV.get(1), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 440), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CertusQuartz, 8), - GT_Utility.getIntegratedCircuit(1) }, - Materials.Plastic.getMolten(144), - Loaders.YFH, - 200, - 1920); - } + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { ItemList.Hatch_Output_IV.get(1), + GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 440), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CertusQuartz, 8), + GT_Utility.getIntegratedCircuit(1) }, + Materials.Plastic.getMolten(144), + Loaders.YFH, + 200, + 1920); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Large_Fluid_Cell_Steel.get(12L), diff --git a/src/main/java/goodgenerator/util/StackUtils.java b/src/main/java/goodgenerator/util/StackUtils.java index 0d0c2a94ee..da928d4d63 100644 --- a/src/main/java/goodgenerator/util/StackUtils.java +++ b/src/main/java/goodgenerator/util/StackUtils.java @@ -6,8 +6,13 @@ import java.util.HashMap; import java.util.List; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import appeng.api.AEApi; +import appeng.api.storage.data.IAEFluidStack; import goodgenerator.items.MyMaterial; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; @@ -122,4 +127,23 @@ public class StackUtils { return MyMaterial.shirabon.getMolten(aAmount); } } + + // === Copied from AE2FC to avoid hard dep === + + public static IAEFluidStack createAEFluidStack(Fluid fluid) { + return createAEFluidStack(new FluidStack(fluid, FluidContainerRegistry.BUCKET_VOLUME)); + } + + public static IAEFluidStack createAEFluidStack(Fluid fluid, long amount) { + return createAEFluidStack(fluid.getID(), amount); + } + + public static IAEFluidStack createAEFluidStack(FluidStack fluid) { + return AEApi.instance().storage().createFluidStack(fluid); + } + + public static IAEFluidStack createAEFluidStack(int fluidId, long amount) { + return createAEFluidStack(new FluidStack(FluidRegistry.getFluid(fluidId), 1)).setStackSize(amount); + } + } |