From 6bb5ff81da2a4ad45d5b76b5e3d0313c3aba33c7 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Fri, 10 Apr 2015 14:53:57 +0200 Subject: [PATCH 01/16] Update de_DE.lang --- src/main/resources/assets/mekanism/lang/de_DE.lang | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/mekanism/lang/de_DE.lang b/src/main/resources/assets/mekanism/lang/de_DE.lang index 6a88281ba..870a9216d 100644 --- a/src/main/resources/assets/mekanism/lang/de_DE.lang +++ b/src/main/resources/assets/mekanism/lang/de_DE.lang @@ -246,7 +246,7 @@ item.dirtySilverDust.name=Dreckiger Silberstaub item.dirtyLeadDust.name=Dreckiger Bleistaub //Ingots -item.obsidianIngot.name=Obsidianbarren +item.obsidianIngot.name=Raffinierter Obsidianbarren item.osmiumIngot.name=Osmiumbarren item.bronzeIngot.name=Bronzebarren item.glowstoneIngot.name=Glowstonebarren @@ -477,6 +477,8 @@ gui.toggleCooling=Kühlmessungen umschalten gui.coolingMeasurements=Aktive Kühlung gui.redstoneOutputMode=Redstone-Modus gui.entityDetection=Entity-Erkennung +gui.moveUp=Nach oben +gui.moveDown=Nach unten gui.reactor.injectionRate=Injektionsrate @@ -731,6 +733,7 @@ tooltip.ReactorController=Der alles kontrollierende Block für !nden gesamten Fu tooltip.ReactorFrame=Verstärkte Hülle, welche im !nFusionsreaktor-Multiblock verwendet werden kann. tooltip.ReactorNeutronCapturePlate=Ein Block, der zum Blockieren der Strahlung !naus einem Fusionsreaktors verwendet werden kann !nund bei der Produktion von Tritium hilft. tooltip.ReactorPort=Ein Block aus verstärktem Material, welcher sowohl den Gas- als auch den Energietransfer des Fusionsreaktors regeln kann. +tooltip.ReactorLogicAdapter=Ein Block, welcher verwendet werden kann, !num einen Reaktor mit Redstone zu überwachen. tooltip.OsmiumOre=Ein hartes Mineral, dass in fast jeder !nHöhenlage der Welt gefunden werden kann. !nEs ist für seine zahlreichen Verwendungszwecke !nin der Konstruktion von Maschinen bekannt. tooltip.CopperOre=Ein häufig vorkommendes, leitfähiges Material, dass !nfür die Produktion von Kabeln verwendet werden kann. !nSeine Fähigkeit, großer Hitze zu widerstehen, !nmacht es auch essentiell für fortgeschrittene Maschinen. From cb95cfeedd466ec3f3052b4d2f3b587d6838358d Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 10 Apr 2015 18:39:06 +0100 Subject: [PATCH 02/16] Fix ITubeConnection acceptors that aren't IGasHandler --- .../common/multipart/PartPressurizedTube.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index 8e45a17f9..44f532152 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -295,4 +295,16 @@ public class PartPressurizedTube extends PartTransmitter Date: Fri, 10 Apr 2015 18:39:27 +0100 Subject: [PATCH 03/16] Fix NPE on creating networks. --- .../mekanism/api/transmitters/TransmitterNetworkRegistry.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index ee2acb380..6992af8ef 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -260,7 +260,8 @@ public class TransmitterNetworkRegistry public void addNetworkToIterated(Coord4D from) { - networksFound.add(startPoint.getExternalNetwork(from)); + N net = startPoint.getExternalNetwork(from); + if(net != null) networksFound.add(net); } } } From 5b558065fc1089022064e326bb821b95e2b27391 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 10 Apr 2015 18:54:38 +0100 Subject: [PATCH 04/16] Might fix the NPE in FluidNetwork that @NitroxydeX was experiencing --- .../api/transmitters/DynamicNetwork.java | 89 +++++++++---------- 1 file changed, 42 insertions(+), 47 deletions(-) diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 6a92bbe46..734f958e8 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -63,27 +63,10 @@ public abstract class DynamicNetwork> implemen { worldObj = transmitter.world(); } - - Coord4D coord = transmitter.coord(); - + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - A acceptor = transmitter.getAcceptor(side); - - if(acceptor != null) - { - Coord4D acceptorCoord = coord.getFromSide(side); - possibleAcceptors.put(acceptorCoord, acceptor); - EnumSet directions = acceptorDirections.get(acceptorCoord); - - if(directions != null) - { - directions.add(side.getOpposite()); - } - else { - acceptorDirections.put(acceptorCoord, EnumSet.of(side.getOpposite())); - } - } + updateTransmitterOnSide(transmitter, side); } transmitter.setTransmitterNetwork((N)this); @@ -107,34 +90,7 @@ public abstract class DynamicNetwork> implemen for(ForgeDirection side : directionsChanged) { - A acceptor = transmitter.getAcceptor(side); - Coord4D acceptorCoord = transmitter.coord().getFromSide(side); - EnumSet directions = acceptorDirections.get(acceptorCoord); - - if(acceptor != null) - { - possibleAcceptors.put(acceptorCoord, acceptor); - - if(directions != null) - { - directions.add(side.getOpposite()); - } - else { - acceptorDirections.put(acceptorCoord, EnumSet.of(side.getOpposite())); - } - } - else { - if(directions != null) - { - directions.remove(side.getOpposite()); - - if(directions.isEmpty()) - { - possibleAcceptors.remove(acceptorCoord); - acceptorDirections.remove(acceptorCoord); - } - } - } + updateTransmitterOnSide(transmitter, side); } } @@ -142,6 +98,45 @@ public abstract class DynamicNetwork> implemen } } + public void updateTransmitterOnSide(IGridTransmitter transmitter, ForgeDirection side) + { + A acceptor = transmitter.getAcceptor(side); + Coord4D acceptorCoord = transmitter.coord().getFromSide(side); + EnumSet directions = acceptorDirections.get(acceptorCoord); + + if(acceptor != null) + { + possibleAcceptors.put(acceptorCoord, acceptor); + + if(directions != null) + { + directions.add(side.getOpposite()); + } + else { + acceptorDirections.put(acceptorCoord, EnumSet.of(side.getOpposite())); + } + } + else { + if(directions != null) + { + directions.remove(side.getOpposite()); + + if(directions.isEmpty()) + { + possibleAcceptors.remove(acceptorCoord); + acceptorDirections.remove(acceptorCoord); + } + } + else + { + possibleAcceptors.remove(acceptorCoord); + acceptorDirections.remove(acceptorCoord); + } + } + + } + + public abstract void absorbBuffer(IGridTransmitter transmitter); public abstract void clampBuffer(); From 05508b598a424eaded9c4936dd5787d255e429a3 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 10 Apr 2015 19:21:34 +0100 Subject: [PATCH 05/16] Fix non-overworld dimensions. --- .../java/mekanism/common/multipart/MultipartTransmitter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java index a6d200b44..03265e0b1 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -37,7 +37,7 @@ public class MultipartTransmitter> extends Tran @Override public Coord4D coord() { - return new Coord4D(getPart().x(), getPart().y(), getPart().z()); + return new Coord4D(getPart().x(), getPart().y(), getPart().z(), getPart().world().provider.dimensionId); } @Override From 91d323ccdd1ebeb3c3320a787b6942c5af243dfc Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 10 Apr 2015 23:41:12 +0100 Subject: [PATCH 06/16] Maybe fix negative buffer issues . --- src/main/java/mekanism/common/EnergyNetwork.java | 4 ++++ .../java/mekanism/common/multipart/PartUniversalCable.java | 1 + 2 files changed, 5 insertions(+) diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 034fae8f9..1b2e2e709 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -76,6 +76,10 @@ public class EnergyNetwork extends DynamicNetwork Date: Fri, 10 Apr 2015 23:42:51 +0100 Subject: [PATCH 07/16] Remove an unused parameter. --- src/main/java/mekanism/common/EnergyNetwork.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 1b2e2e709..61daf323f 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -114,12 +114,12 @@ public class EnergyNetwork extends DynamicNetwork 0 && sent-prev > 0 && i < 100; @@ -143,7 +143,7 @@ public class EnergyNetwork extends DynamicNetwork Date: Fri, 10 Apr 2015 23:44:48 +0100 Subject: [PATCH 08/16] Clean up some TransporterPathfinder stuff. --- .../content/transporter/PathfinderCache.java | 18 ++++++++---------- .../transporter/TransporterPathfinder.java | 10 +++++----- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java index 8b3abd742..2e8f4e015 100644 --- a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java +++ b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java @@ -1,6 +1,5 @@ package mekanism.common.content.transporter; -import java.util.ArrayList; import java.util.EnumSet; import java.util.HashMap; import java.util.List; @@ -19,20 +18,19 @@ public class PathfinderCache reset(); } - public static ArrayList getCache(Coord4D start, Coord4D end, EnumSet sides) + public static List getCache(Coord4D start, Coord4D end, EnumSet sides) { - ArrayList ret = null; + List ret = null; - for(Map.Entry> entry : cachedPaths.entrySet()) + for(ForgeDirection side : sides) { - PathData data = entry.getKey(); + PathData data = new PathData(start, end, side); + + List test = cachedPaths.get(data); - if(data.startTransporter.equals(start) && data.end.equals(end) && sides.contains(data.endSide)) + if(ret == null || (test != null && test.size() < ret.size())) { - if(ret == null || entry.getValue().size() < ret.size()) - { - ret = (ArrayList)entry.getValue(); - } + ret = test; } } diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index de002b6bb..d88b8944f 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -151,14 +151,14 @@ public final class TransporterPathfinder public static class Destination implements Comparable { - public List path = new ArrayList(); + public List path; public Path pathType; public ItemStack rejected; public double score; - public Destination(ArrayList list, boolean inv, ItemStack rejects, double gScore) + public Destination(List list, boolean inv, ItemStack rejects, double gScore) { - path = (List)list.clone(); + path = new ArrayList<>(list); if(inv) { @@ -253,7 +253,7 @@ public final class TransporterPathfinder public static Destination getPath(DestChecker checker, EnumSet sides, ILogisticalTransporter start, Coord4D dest, TransporterStack stack, ItemStack rejects, int min) { - ArrayList test = PathfinderCache.getCache(start.coord(), dest, sides); + List test = PathfinderCache.getCache(start.coord(), dest, sides); if(test != null) { @@ -489,7 +489,7 @@ public final class TransporterPathfinder { ArrayList path = new ArrayList(); path.add(finalNode); - path.addAll((ArrayList)results.clone()); + path.addAll(results); return path; } From 17e1cea25a5d402147b9f7056364db44d8756318 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 11 Apr 2015 14:27:21 +0100 Subject: [PATCH 09/16] Possible fix for EnergyNet weirdness. --- .../mekanism/common/multipart/PartUniversalCable.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index a944a17c1..749828eea 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -382,6 +382,13 @@ public class PartUniversalCable extends PartTransmitter Date: Sat, 11 Apr 2015 14:27:21 +0100 Subject: [PATCH 10/16] Possible fix for EnergyNet weirdness. --- .../mekanism/common/multipart/PartUniversalCable.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index a944a17c1..749828eea 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -382,6 +382,13 @@ public class PartUniversalCable extends PartTransmitter Date: Sun, 12 Apr 2015 00:09:35 +0100 Subject: [PATCH 11/16] Fix the draining issue --- src/main/java/mekanism/common/util/CableUtils.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 005c3a457..4c4b3eae0 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -127,6 +127,11 @@ public final class CableUtils */ public static boolean isValidAcceptorOnSide(TileEntity cableEntity, TileEntity tile, ForgeDirection side) { + if(isCable(tile)) + { + return false; + } + if(isEnergyAcceptor(tile) && isConnectable(cableEntity, tile, side)) { return true; From 13221b5bf322eb6e56b963bc3eaea9a70df86b94 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 12 Apr 2015 00:12:18 +0100 Subject: [PATCH 12/16] Remove some unused methods. --- .../java/mekanism/common/util/CableUtils.java | 74 ------------------- 1 file changed, 74 deletions(-) diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 4c4b3eae0..515e2524d 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -25,30 +25,6 @@ import cofh.api.energy.IEnergyReceiver; public final class CableUtils { - private static Set allSides = EnumSet.complementOf(EnumSet.of(ForgeDirection.UNKNOWN)); - - /** - * Gets all the connected energy acceptors, whether IC2-based or BuildCraft-based, surrounding a specific tile entity. - * @param tileEntity - center tile entity - * @return TileEntity[] of connected acceptors - */ - public static TileEntity[] getConnectedEnergyAcceptors(TileEntity tileEntity) - { - TileEntity[] acceptors = new TileEntity[] {null, null, null, null, null, null}; - - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) - { - TileEntity acceptor = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj()); - - if(isEnergyAcceptor(acceptor)) - { - acceptors[orientation.ordinal()] = acceptor; - } - } - - return acceptors; - } - public static boolean isEnergyAcceptor(TileEntity tileEntity) { return (tileEntity instanceof IStrictEnergyAcceptor || @@ -56,28 +32,6 @@ public final class CableUtils (MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver)); } - /** - * Gets all the connected cables around a specific tile entity. - * @param tileEntity - center tile entity - * @return TileEntity[] of connected cables - */ - public static TileEntity[] getConnectedCables(TileEntity tileEntity) - { - TileEntity[] cables = new TileEntity[] {null, null, null, null, null, null}; - - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) - { - TileEntity cable = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj()); - - if(isCable(cable)) - { - cables[orientation.ordinal()] = cable; - } - } - - return cables; - } - public static boolean isCable(TileEntity tileEntity) { if(tileEntity instanceof ITransmitterTile) @@ -87,16 +41,6 @@ public final class CableUtils return false; } - /** - * Gets all the adjacent connections to a TileEntity. - * @param tileEntity - center TileEntity - * @return boolean[] of adjacent connections - */ - public static boolean[] getConnections(TileEntity tileEntity) - { - return getConnections(tileEntity, allSides); - } - /** * Gets the adjacent connections to a TileEntity, from a subset of its sides. * @param tileEntity - center TileEntity @@ -169,24 +113,6 @@ public final class CableUtils (MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())); } - /** - * Whether or not a cable can connect to a specific acceptor. - * @param side - side to check - * @param tile - cable TileEntity - * @return whether or not the cable can connect to the specific side - */ - public static boolean canConnectToAcceptor(ForgeDirection side, TileEntity tile) - { - if(tile == null) - { - return false; - } - - TileEntity tileEntity = Coord4D.get(tile).getFromSide(side).getTileEntity(tile.getWorldObj()); - - return isConnectable(tile, tileEntity, side); - } - public static boolean isConnectable(TileEntity orig, TileEntity tileEntity, ForgeDirection side) { if(tileEntity instanceof ITransmitterTile) From 66ce6c6827e2a247c4c0a4a6119ae939e57e417b Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 12 Apr 2015 00:12:40 +0100 Subject: [PATCH 13/16] Update dependencies. --- build.gradle | 2 +- build.properties | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index e11669df2..0cefca483 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ sourceCompatibility = '1.7' targetCompatibility = '1.7' minecraft { - version = config.minecraft_version + "-" + config.forge_version + version = config.minecraft_version + "-" + config.forge_version + "-" + config.minecraft_version } processResources diff --git a/build.properties b/build.properties index ea0dbd3b3..f298f2b27 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft_version=1.7.10 -forge_version=10.13.2.1291 -FMP_version=1.1.1.320 -CCLIB_version=1.1.1.110 -NEI_version=1.0.4.83 -CCC_version=1.0.4.35 +forge_version=10.13.3.1365 +FMP_version=1.1.2.331 +CCLIB_version=1.1.3.127 +NEI_version=1.0.5.96 +CCC_version=1.0.5.36 mod_version=8.1.1 From c23aafee9f3e40c062da76260a03c58ddf9549c4 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 12 Apr 2015 00:19:49 +0100 Subject: [PATCH 14/16] Should fix the NPE in updateTransmitterOnSide. --- .../mekanism/api/transmitters/DynamicNetwork.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 734f958e8..fd78b865c 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -35,8 +35,6 @@ public abstract class DynamicNetwork> implemen protected Range4D packetRange = null; - protected int ticksSinceCreate = 0; - protected int capacity = 0; protected double meanCapacity = 0; @@ -86,11 +84,14 @@ public abstract class DynamicNetwork> implemen for(Entry, EnumSet> entry : changedAcceptors.entrySet()) { IGridTransmitter transmitter = entry.getKey(); - EnumSet directionsChanged = entry.getValue(); - - for(ForgeDirection side : directionsChanged) + if(transmitter.isValid()) { - updateTransmitterOnSide(transmitter, side); + EnumSet directionsChanged = entry.getValue(); + + for(ForgeDirection side : directionsChanged) + { + updateTransmitterOnSide(transmitter, side); + } } } From 866abf5c8d65c26eea58dcf3a3f8889e46d0a205 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 12 Apr 2015 00:38:28 +0100 Subject: [PATCH 15/16] Fix build. --- build.properties | 4 ++-- src/api/java/buildcraft/api/core/StackKey.java | 4 ++-- src/main/java/mekanism/common/FluidNetwork.java | 2 +- .../java/mekanism/common/content/boiler/BoilerTank.java | 8 ++++---- .../mekanism/common/content/tank/DynamicFluidTank.java | 8 ++++---- src/main/java/mekanism/common/item/ItemBlockMachine.java | 2 +- src/main/java/mekanism/common/item/ItemGaugeDropper.java | 2 +- src/main/java/mekanism/common/tile/TileEntityBoiler.java | 4 ++-- .../java/mekanism/common/tile/TileEntityDynamicTank.java | 2 +- .../java/mekanism/common/tile/TileEntityElectricPump.java | 2 +- .../mekanism/common/tile/TileEntityFluidicPlenisher.java | 2 +- .../java/mekanism/common/tile/TileEntityPortableTank.java | 2 +- .../common/tile/TileEntityRotaryCondensentrator.java | 2 +- .../common/tile/TileEntitySolarEvaporationController.java | 4 ++-- .../generators/common/item/ItemBlockGenerator.java | 2 +- .../generators/common/tile/TileEntityHeatGenerator.java | 6 +++--- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/build.properties b/build.properties index f298f2b27..10694f674 100644 --- a/build.properties +++ b/build.properties @@ -2,6 +2,6 @@ minecraft_version=1.7.10 forge_version=10.13.3.1365 FMP_version=1.1.2.331 CCLIB_version=1.1.3.127 -NEI_version=1.0.5.96 -CCC_version=1.0.5.36 +NEI_version=1.0.4.95 +CCC_version=1.0.4.35 mod_version=8.1.1 diff --git a/src/api/java/buildcraft/api/core/StackKey.java b/src/api/java/buildcraft/api/core/StackKey.java index 092c173f0..257a32a16 100644 --- a/src/api/java/buildcraft/api/core/StackKey.java +++ b/src/api/java/buildcraft/api/core/StackKey.java @@ -87,7 +87,7 @@ public final class StackKey { } } if (fluidStack != null) { - if (fluidStack.fluidID != k.fluidStack.fluidID || + if (fluidStack.getFluidID() != k.fluidStack.getFluidID() || fluidStack.amount != k.fluidStack.amount || !objectsEqual(fluidStack.tag, k.fluidStack.tag)) { return false; @@ -106,7 +106,7 @@ public final class StackKey { } result = 31 * result + 7; if (fluidStack != null) { - result = 31 * result + fluidStack.fluidID; + result = 31 * result + fluidStack.getFluidID(); result = 31 * result + fluidStack.amount; result = 31 * result + objectHashCode(fluidStack.tag); } diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 816dd026d..209ada00b 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -161,7 +161,7 @@ public class FluidNetwork extends DynamicNetwork if(acceptor != null && fluidToSend != null) { - fluidSent += acceptor.fill(side, new FluidStack(fluidToSend.fluidID, currentSending), doTransfer); + fluidSent += acceptor.fill(side, new FluidStack(fluidToSend.getFluidID(), currentSending), doTransfer); } if(fluidSent > prev) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerTank.java b/src/main/java/mekanism/common/content/boiler/BoilerTank.java index c4e60e754..b33b93b21 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerTank.java @@ -31,12 +31,12 @@ public abstract class BoilerTank implements IFluidTank { if(steamBoiler.structure != null && !steamBoiler.getWorldObj().isRemote) { - if(resource == null || resource.fluidID <= 0) + if(resource == null || resource.getFluidID() <= 0) { return 0; } - if(getFluid() == null || getFluid().fluidID <= 0) + if(getFluid() == null || getFluid().getFluidID() <= 0) { if(resource.amount <= getCapacity()) { @@ -138,7 +138,7 @@ public abstract class BoilerTank implements IFluidTank { if(steamBoiler.structure != null && !steamBoiler.getWorldObj().isRemote) { - if(getFluid() == null || getFluid().fluidID <= 0) + if(getFluid() == null || getFluid().getFluidID() <= 0) { return null; } @@ -160,7 +160,7 @@ public abstract class BoilerTank implements IFluidTank getFluid().amount -= used; } - FluidStack drained = new FluidStack(getFluid().fluidID, used); + FluidStack drained = new FluidStack(getFluid().getFluidID(), used); if(getFluid().amount <= 0) { diff --git a/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java b/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java index 4753685ba..c9672dfb5 100644 --- a/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java +++ b/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java @@ -34,7 +34,7 @@ public class DynamicFluidTank implements IFluidTank { if(dynamicTank.structure != null && !dynamicTank.getWorldObj().isRemote) { - if(resource == null || resource.fluidID <= 0) + if(resource == null || resource.getFluidID() <= 0) { return 0; } @@ -44,7 +44,7 @@ public class DynamicFluidTank implements IFluidTank return 0; } - if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.fluidID <= 0) + if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.getFluidID() <= 0) { if(resource.amount <= getCapacity()) { @@ -138,7 +138,7 @@ public class DynamicFluidTank implements IFluidTank { if(dynamicTank.structure != null && !dynamicTank.getWorldObj().isRemote) { - if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.fluidID <= 0) + if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.getFluidID() <= 0) { return null; } @@ -160,7 +160,7 @@ public class DynamicFluidTank implements IFluidTank dynamicTank.structure.fluidStored.amount -= used; } - FluidStack drained = new FluidStack(dynamicTank.structure.fluidStored.fluidID, used); + FluidStack drained = new FluidStack(dynamicTank.structure.fluidStored.getFluidID(), used); if(dynamicTank.structure.fluidStored.amount <= 0) { diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 4c7b8be3e..61afb3bc2 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -669,7 +669,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec itemStack.setTagCompound(new NBTTagCompound()); } - if(fluidStack == null || fluidStack.amount == 0 || fluidStack.fluidID == 0) + if(fluidStack == null || fluidStack.amount == 0 || fluidStack.getFluidID() == 0) { itemStack.stackTagCompound.removeTag("fluidTank"); } diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 7ccdd8972..ddf5b6a77 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -130,7 +130,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo container.setTagCompound(new NBTTagCompound()); } - if(stack == null || stack.amount == 0 || stack.fluidID == 0) + if(stack == null || stack.amount == 0 || stack.getFluidID() == 0) { container.stackTagCompound.removeTag("fluidStack"); } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoiler.java b/src/main/java/mekanism/common/tile/TileEntityBoiler.java index 5133c3179..c6c12ef8a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoiler.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoiler.java @@ -312,7 +312,7 @@ public class TileEntityBoiler extends TileEntityMultiblock 0 || (FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).fluidID == FluidRegistry.LAVA.getID()); + return getFuel(itemstack) > 0 || (FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).getFluidID() == FluidRegistry.LAVA.getID()); } else if(slotID == 1) { @@ -329,7 +329,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(resource.fluidID == FluidRegistry.LAVA.getID() && from != ForgeDirection.getOrientation(facing)) + if(resource.getFluidID() == FluidRegistry.LAVA.getID() && from != ForgeDirection.getOrientation(facing)) { return lavaTank.fill(resource, doFill); } From 03e45cc40134d2a6a004d8aa594bc5b3ab1be600 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 12 Apr 2015 03:38:33 +0100 Subject: [PATCH 16/16] Back to Forge 1291. Turns out I do silly things when I'm tired... --- build.gradle | 2 +- build.properties | 2 +- src/api/java/buildcraft/api/core/StackKey.java | 4 ++-- src/main/java/mekanism/common/FluidNetwork.java | 2 +- .../java/mekanism/common/content/boiler/BoilerTank.java | 8 ++++---- .../mekanism/common/content/tank/DynamicFluidTank.java | 8 ++++---- src/main/java/mekanism/common/item/ItemBlockMachine.java | 2 +- src/main/java/mekanism/common/item/ItemGaugeDropper.java | 2 +- src/main/java/mekanism/common/tile/TileEntityBoiler.java | 4 ++-- .../java/mekanism/common/tile/TileEntityDynamicTank.java | 2 +- .../java/mekanism/common/tile/TileEntityElectricPump.java | 2 +- .../mekanism/common/tile/TileEntityFluidicPlenisher.java | 2 +- .../java/mekanism/common/tile/TileEntityPortableTank.java | 2 +- .../common/tile/TileEntityRotaryCondensentrator.java | 2 +- .../common/tile/TileEntitySolarEvaporationController.java | 4 ++-- .../generators/common/item/ItemBlockGenerator.java | 2 +- .../generators/common/tile/TileEntityHeatGenerator.java | 6 +++--- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 0cefca483..d3de05396 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ sourceCompatibility = '1.7' targetCompatibility = '1.7' minecraft { - version = config.minecraft_version + "-" + config.forge_version + "-" + config.minecraft_version + version = config.minecraft_version + "-" + config.forge_version// + "-" + config.minecraft_version } processResources diff --git a/build.properties b/build.properties index 10694f674..bf1c6dc5d 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.10 -forge_version=10.13.3.1365 +forge_version=10.13.2.1291 FMP_version=1.1.2.331 CCLIB_version=1.1.3.127 NEI_version=1.0.4.95 diff --git a/src/api/java/buildcraft/api/core/StackKey.java b/src/api/java/buildcraft/api/core/StackKey.java index 257a32a16..092c173f0 100644 --- a/src/api/java/buildcraft/api/core/StackKey.java +++ b/src/api/java/buildcraft/api/core/StackKey.java @@ -87,7 +87,7 @@ public final class StackKey { } } if (fluidStack != null) { - if (fluidStack.getFluidID() != k.fluidStack.getFluidID() || + if (fluidStack.fluidID != k.fluidStack.fluidID || fluidStack.amount != k.fluidStack.amount || !objectsEqual(fluidStack.tag, k.fluidStack.tag)) { return false; @@ -106,7 +106,7 @@ public final class StackKey { } result = 31 * result + 7; if (fluidStack != null) { - result = 31 * result + fluidStack.getFluidID(); + result = 31 * result + fluidStack.fluidID; result = 31 * result + fluidStack.amount; result = 31 * result + objectHashCode(fluidStack.tag); } diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 209ada00b..816dd026d 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -161,7 +161,7 @@ public class FluidNetwork extends DynamicNetwork if(acceptor != null && fluidToSend != null) { - fluidSent += acceptor.fill(side, new FluidStack(fluidToSend.getFluidID(), currentSending), doTransfer); + fluidSent += acceptor.fill(side, new FluidStack(fluidToSend.fluidID, currentSending), doTransfer); } if(fluidSent > prev) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerTank.java b/src/main/java/mekanism/common/content/boiler/BoilerTank.java index b33b93b21..c4e60e754 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerTank.java @@ -31,12 +31,12 @@ public abstract class BoilerTank implements IFluidTank { if(steamBoiler.structure != null && !steamBoiler.getWorldObj().isRemote) { - if(resource == null || resource.getFluidID() <= 0) + if(resource == null || resource.fluidID <= 0) { return 0; } - if(getFluid() == null || getFluid().getFluidID() <= 0) + if(getFluid() == null || getFluid().fluidID <= 0) { if(resource.amount <= getCapacity()) { @@ -138,7 +138,7 @@ public abstract class BoilerTank implements IFluidTank { if(steamBoiler.structure != null && !steamBoiler.getWorldObj().isRemote) { - if(getFluid() == null || getFluid().getFluidID() <= 0) + if(getFluid() == null || getFluid().fluidID <= 0) { return null; } @@ -160,7 +160,7 @@ public abstract class BoilerTank implements IFluidTank getFluid().amount -= used; } - FluidStack drained = new FluidStack(getFluid().getFluidID(), used); + FluidStack drained = new FluidStack(getFluid().fluidID, used); if(getFluid().amount <= 0) { diff --git a/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java b/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java index c9672dfb5..4753685ba 100644 --- a/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java +++ b/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java @@ -34,7 +34,7 @@ public class DynamicFluidTank implements IFluidTank { if(dynamicTank.structure != null && !dynamicTank.getWorldObj().isRemote) { - if(resource == null || resource.getFluidID() <= 0) + if(resource == null || resource.fluidID <= 0) { return 0; } @@ -44,7 +44,7 @@ public class DynamicFluidTank implements IFluidTank return 0; } - if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.getFluidID() <= 0) + if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.fluidID <= 0) { if(resource.amount <= getCapacity()) { @@ -138,7 +138,7 @@ public class DynamicFluidTank implements IFluidTank { if(dynamicTank.structure != null && !dynamicTank.getWorldObj().isRemote) { - if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.getFluidID() <= 0) + if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.fluidID <= 0) { return null; } @@ -160,7 +160,7 @@ public class DynamicFluidTank implements IFluidTank dynamicTank.structure.fluidStored.amount -= used; } - FluidStack drained = new FluidStack(dynamicTank.structure.fluidStored.getFluidID(), used); + FluidStack drained = new FluidStack(dynamicTank.structure.fluidStored.fluidID, used); if(dynamicTank.structure.fluidStored.amount <= 0) { diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 61afb3bc2..4c7b8be3e 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -669,7 +669,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec itemStack.setTagCompound(new NBTTagCompound()); } - if(fluidStack == null || fluidStack.amount == 0 || fluidStack.getFluidID() == 0) + if(fluidStack == null || fluidStack.amount == 0 || fluidStack.fluidID == 0) { itemStack.stackTagCompound.removeTag("fluidTank"); } diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index ddf5b6a77..7ccdd8972 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -130,7 +130,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo container.setTagCompound(new NBTTagCompound()); } - if(stack == null || stack.amount == 0 || stack.getFluidID() == 0) + if(stack == null || stack.amount == 0 || stack.fluidID == 0) { container.stackTagCompound.removeTag("fluidStack"); } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoiler.java b/src/main/java/mekanism/common/tile/TileEntityBoiler.java index c6c12ef8a..5133c3179 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoiler.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoiler.java @@ -312,7 +312,7 @@ public class TileEntityBoiler extends TileEntityMultiblock 0 || (FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).getFluidID() == FluidRegistry.LAVA.getID()); + return getFuel(itemstack) > 0 || (FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).fluidID == FluidRegistry.LAVA.getID()); } else if(slotID == 1) { @@ -329,7 +329,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(resource.getFluidID() == FluidRegistry.LAVA.getID() && from != ForgeDirection.getOrientation(facing)) + if(resource.fluidID == FluidRegistry.LAVA.getID() && from != ForgeDirection.getOrientation(facing)) { return lavaTank.fill(resource, doFill); }