diff --git a/build.gradle b/build.gradle index e44dc88f..e8f24f79 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ buildscript { repositories { mavenCentral() - maven { url = "http://files.minecraftforge.net/maven" } - maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" } + maven { url = "https://jitpack.io" } + maven { url = "https://gregtech.overminddl1.com/" } } - dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' } + dependencies { classpath 'com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT' } } plugins { id 'idea' diff --git a/gradle.properties b/gradle.properties index 4452103a..1fb6e80f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ minecraft_version=1.7.10 forge_version=10.13.4.1614-1.7.10 forgeDep_version=10.13.4.1614 -mod_version=2.3.1.16_beta +mod_version=2.3.1.17_beta #Comment out this line to get rid of the appendix #mod_appendix=beta diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java index 4aea2e47..de29e98b 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java @@ -14,15 +14,15 @@ import crazypants.enderio.network.PacketHandler; public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile { // Power - private Capacitors capacitorType = Capacitors.BASIC_CAPACITOR; - private ICapacitor capacitor = Capacitors.BASIC_CAPACITOR.capacitor; + private Capacitors capacitorType; + private ICapacitor capacitor; - private int storedEnergyRF = 0; + private int storedEnergyRF; protected float lastSyncPowerStored = -1; protected AbstractPoweredMachineEntity(SlotDefinition slotDefinition) { super(slotDefinition); - setCapacitor(Capacitors.BASIC_CAPACITOR); + capacitorType = Capacitors.BASIC_CAPACITOR; } @Override @@ -40,7 +40,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity return; } boolean powerChanged = (lastSyncPowerStored != storedEnergyRF && shouldDoWorkThisTick(5)); - if(powerChanged) { + if (powerChanged) { lastSyncPowerStored = storedEnergyRF; PacketHandler.sendToAllAround(new PacketPowerStorage(this), this); } @@ -55,7 +55,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity @Override public int getMaxEnergyRecieved(ForgeDirection dir) { - if(isSideDisabled(dir.ordinal())) { + if (isSideDisabled(dir.ordinal())) { return 0; } return getCapacitor().getMaxEnergyReceived(); @@ -93,18 +93,16 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity public ICapacitor getCapacitor() { - if(capacitor != null) { - return capacitor; - } + if (capacitor != null) { + return capacitor; + } else if (capacitorType == Capacitors.TOTEMIC_CAPACITOR) { + ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; + if (contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) { + return EnderIO.itemBasicCapacitor.getCapacitor(contents); + } + } - else if(capacitorType == Capacitors.TOTEMIC_CAPACITOR) { - ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; - if(contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) { - return EnderIO.itemBasicCapacitor.getCapacitor(contents); - } - } - - return capacitorType.capacitor; + return capacitorType.capacitor; } @@ -122,15 +120,13 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity public void setCapacitor(Capacitors capacitorType) { this.capacitorType = capacitorType; - if(capacitorType == Capacitors.TOTEMIC_CAPACITOR) { - ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; - if(contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) { - setCapacitor(EnderIO.itemBasicCapacitor.getCapacitor(contents)); - } - } - - else { - this.capacitor = capacitorType.capacitor; + if (capacitorType == Capacitors.TOTEMIC_CAPACITOR) { + ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; + if (contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) { + setCapacitor(EnderIO.itemBasicCapacitor.getCapacitor(contents)); + } + } else { + this.capacitor = capacitorType.capacitor; } onCapacitorTypeChange(); @@ -148,7 +144,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity @Override public void setInventorySlotContents(int slot, ItemStack contents) { super.setInventorySlotContents(slot, contents); - if(slotDefinition.isUpgradeSlot(slot)) { + if (slotDefinition.isUpgradeSlot(slot)) { updateCapacitorFromSlot(); } } @@ -156,19 +152,19 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity @Override public ItemStack decrStackSize(int fromSlot, int amount) { ItemStack res = super.decrStackSize(fromSlot, amount); - if(slotDefinition.isUpgradeSlot(fromSlot)) { + if (slotDefinition.isUpgradeSlot(fromSlot)) { updateCapacitorFromSlot(); } return res; } private void updateCapacitorFromSlot() { - if(slotDefinition.getNumUpgradeSlots() <= 0) { + if (slotDefinition.getNumUpgradeSlots() <= 0) { setCapacitor(Capacitors.BASIC_CAPACITOR); return; } ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; - if(contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) { + if (contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) { setCapacitor(Capacitors.BASIC_CAPACITOR); } else { setCapacitor(Capacitors.values()[contents.getItemDamage()]); @@ -183,54 +179,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity @Override public void readCommon(NBTTagCompound nbtRoot) { super.readCommon(nbtRoot); - handleCapacitorLoading(nbtRoot); - handleStoredEnergyLoading(nbtRoot); - } - - /** - * Write state common to both block and item - */ - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - - //Write Energy - nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, storedEnergyRF); - //Write Capacitor Type DEPRECATED - nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal()); - //Write Actual Capacitor - writeCap(nbtRoot); - } - - private static final String CAPACITOR_TAG_STRING = "internalCapacitor"; - - private void writeCap(NBTTagCompound nbtRoot) { - NBTTagCompound cap = new NBTTagCompound(); - cap.setInteger("MaxEnergyStored", capacitor.getMaxEnergyStored()); - cap.setInteger("MaxEnergyExtracted", capacitor.getMaxEnergyExtracted()); - cap.setInteger("MaxEnergyReceived", capacitor.getMaxEnergyReceived()); - cap.setInteger("Tier", capacitor.getTier()); - nbtRoot.setTag(CAPACITOR_TAG_STRING, cap); - } - - private void readCap(NBTTagCompound nbtRoot) { - NBTTagCompound cap = nbtRoot.getCompoundTag(CAPACITOR_TAG_STRING); - setCapacitor(new BasicCapacitor( - cap.getInteger("Tier"), - cap.getInteger("MaxEnergyReceived"), - cap.getInteger("MaxEnergyStored"), - cap.getInteger("MaxEnergyExtracted") - )); - } - - private void handleCapacitorLoading(NBTTagCompound nbtRoot){ - if (nbtRoot.hasKey(CAPACITOR_TAG_STRING)) - readCap(nbtRoot); - else //Read Capacitor Type DEPRECATED - setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]); - } - - private void handleStoredEnergyLoading(NBTTagCompound nbtRoot){ + setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]); int energy; if (nbtRoot.hasKey("storedEnergy")) { float storedEnergyMJ = nbtRoot.getFloat("storedEnergy"); @@ -240,4 +189,14 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity } setEnergyStored(energy); } -} + + /** + * Write state common to both block and item + */ + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, storedEnergyRF); + nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal()); + } +} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java index b6b8f5dd..d1875e0f 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -48,6 +48,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid private final SetMultimap sendChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); private final SetMultimap recieveChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); + private final ICapacitor capacitor = new BasicCapacitor(0, Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF); private boolean sendChannelsDirty = false; private boolean recieveChannelsDirty = false; private boolean registered = false; @@ -73,7 +74,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid sendItemFilter = new ItemFilter(true); recieveItemFilter = new ItemFilter(true); - setCapacitor(new BasicCapacitor(0,Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF)); } public EnderRailController getRailController() { @@ -160,6 +160,12 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid return hasPower(); } + + @Override + public ICapacitor getCapacitor() { + return capacitor; + } + @Override public int getPowerUsePerTick() { return Config.transceiverUpkeepCostRF;