From 4cd2d07d4c5475a2c551f585ce231830e26a4d34 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Sun, 6 Oct 2013 09:24:58 -0700 Subject: [PATCH] Remove MFR support --- .../MineFactoryReloaded.java | 0 .../harvestables/HarvestableOreBerry.java | 0 .../api/FarmingRegistry.java | 0 .../api/FertilizerType.java | 0 .../minefactoryreloaded/api/HarvestType.java | 0 .../api/IDeepStorageUnit.java | 0 .../api/IFactoryFertilizable.java | 0 .../api/IFactoryFertilizer.java | 0 .../api/IFactoryFruit.java | 0 .../api/IFactoryGrindable.java | 0 .../api/IFactoryHarvestable.java | 0 .../api/IFactoryPlantable.java | 0 .../api/IFactoryRanchable.java | 0 .../api/ILiquidDrinkHandler.java | 0 .../api/IMobEggHandler.java | 0 .../api/IRandomMobProvider.java | 0 .../api/ISafariNetHandler.java | 0 .../minefactoryreloaded/api/ISyringe.java | 0 .../minefactoryreloaded/api/IToolHammer.java | 0 .../api/IToolHammerAdvanced.java | 0 .../minefactoryreloaded/api/MobDrop.java | 0 .../minefactoryreloaded/api/RandomMob.java | 0 .../api/rednet/IConnectableRedNet.java | 0 .../api/rednet/IRedNetLogicCircuit.java | 0 .../api/rednet/IRedNetNetworkContainer.java | 0 .../api/rednet/RedNetConnectionType.java | 0 graveyard/readme.txt | 1 + src/tconstruct/blocks/SmelteryBlock.java | 10 +++---- .../blocks/component/SmelteryScan.java | 20 ++++++++++---- .../blocks/logic/AdaptiveSmelteryLogic.java | 26 +++++++++++++++++++ .../library/component/TankLayerScan.java | 10 ++----- 31 files changed, 49 insertions(+), 18 deletions(-) rename {src/tconstruct/plugins => graveyard}/minefactoryreloaded/MineFactoryReloaded.java (100%) rename {src/tconstruct/plugins => graveyard}/minefactoryreloaded/harvestables/HarvestableOreBerry.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/FarmingRegistry.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/FertilizerType.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/HarvestType.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/IFactoryFruit.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/IMobEggHandler.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/ISyringe.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/IToolHammer.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/MobDrop.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/RandomMob.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java (100%) rename {src => graveyard}/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java (100%) create mode 100644 graveyard/readme.txt diff --git a/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java b/graveyard/minefactoryreloaded/MineFactoryReloaded.java similarity index 100% rename from src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java rename to graveyard/minefactoryreloaded/MineFactoryReloaded.java diff --git a/src/tconstruct/plugins/minefactoryreloaded/harvestables/HarvestableOreBerry.java b/graveyard/minefactoryreloaded/harvestables/HarvestableOreBerry.java similarity index 100% rename from src/tconstruct/plugins/minefactoryreloaded/harvestables/HarvestableOreBerry.java rename to graveyard/minefactoryreloaded/harvestables/HarvestableOreBerry.java diff --git a/src/powercrystals/minefactoryreloaded/api/FarmingRegistry.java b/graveyard/powercrystals/minefactoryreloaded/api/FarmingRegistry.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/FarmingRegistry.java rename to graveyard/powercrystals/minefactoryreloaded/api/FarmingRegistry.java diff --git a/src/powercrystals/minefactoryreloaded/api/FertilizerType.java b/graveyard/powercrystals/minefactoryreloaded/api/FertilizerType.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/FertilizerType.java rename to graveyard/powercrystals/minefactoryreloaded/api/FertilizerType.java diff --git a/src/powercrystals/minefactoryreloaded/api/HarvestType.java b/graveyard/powercrystals/minefactoryreloaded/api/HarvestType.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/HarvestType.java rename to graveyard/powercrystals/minefactoryreloaded/api/HarvestType.java diff --git a/src/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/graveyard/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java rename to graveyard/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java b/graveyard/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java rename to graveyard/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java b/graveyard/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java rename to graveyard/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryFruit.java b/graveyard/powercrystals/minefactoryreloaded/api/IFactoryFruit.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryFruit.java rename to graveyard/powercrystals/minefactoryreloaded/api/IFactoryFruit.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java b/graveyard/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java rename to graveyard/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java b/graveyard/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java rename to graveyard/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java b/graveyard/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java rename to graveyard/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java b/graveyard/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java rename to graveyard/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java diff --git a/src/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java b/graveyard/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java rename to graveyard/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java diff --git a/src/powercrystals/minefactoryreloaded/api/IMobEggHandler.java b/graveyard/powercrystals/minefactoryreloaded/api/IMobEggHandler.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IMobEggHandler.java rename to graveyard/powercrystals/minefactoryreloaded/api/IMobEggHandler.java diff --git a/src/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java b/graveyard/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java rename to graveyard/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java diff --git a/src/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java b/graveyard/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java rename to graveyard/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java diff --git a/src/powercrystals/minefactoryreloaded/api/ISyringe.java b/graveyard/powercrystals/minefactoryreloaded/api/ISyringe.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/ISyringe.java rename to graveyard/powercrystals/minefactoryreloaded/api/ISyringe.java diff --git a/src/powercrystals/minefactoryreloaded/api/IToolHammer.java b/graveyard/powercrystals/minefactoryreloaded/api/IToolHammer.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IToolHammer.java rename to graveyard/powercrystals/minefactoryreloaded/api/IToolHammer.java diff --git a/src/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java b/graveyard/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java rename to graveyard/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java diff --git a/src/powercrystals/minefactoryreloaded/api/MobDrop.java b/graveyard/powercrystals/minefactoryreloaded/api/MobDrop.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/MobDrop.java rename to graveyard/powercrystals/minefactoryreloaded/api/MobDrop.java diff --git a/src/powercrystals/minefactoryreloaded/api/RandomMob.java b/graveyard/powercrystals/minefactoryreloaded/api/RandomMob.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/RandomMob.java rename to graveyard/powercrystals/minefactoryreloaded/api/RandomMob.java diff --git a/src/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java b/graveyard/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java rename to graveyard/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java diff --git a/src/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java b/graveyard/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java rename to graveyard/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java diff --git a/src/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java b/graveyard/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java rename to graveyard/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java diff --git a/src/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java b/graveyard/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java rename to graveyard/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java diff --git a/graveyard/readme.txt b/graveyard/readme.txt new file mode 100644 index 00000000..55a5cd53 --- /dev/null +++ b/graveyard/readme.txt @@ -0,0 +1 @@ +The ghost of mods past. May they rest in peace and update in explosions. \ No newline at end of file diff --git a/src/tconstruct/blocks/SmelteryBlock.java b/src/tconstruct/blocks/SmelteryBlock.java index 0b473092..6d0d3647 100644 --- a/src/tconstruct/blocks/SmelteryBlock.java +++ b/src/tconstruct/blocks/SmelteryBlock.java @@ -40,11 +40,11 @@ public class SmelteryBlock extends InventoryBlock /* Rendering */ - @Override + /*@Override public int getRenderType () { return SmelteryRender.smelteryModel; - } + }*/ @Override public String[] getTextureNames () @@ -216,7 +216,7 @@ public class SmelteryBlock extends InventoryBlock switch (metadata) { case 0: - return new SmelteryLogic(); + return new AdaptiveSmelteryLogic(); case 1: return new SmelteryDrainLogic(); case 3: @@ -225,7 +225,7 @@ public class SmelteryBlock extends InventoryBlock return new MultiServantLogic(); } - @Override + /*@Override public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) { super.onBlockPlacedBy(world, x, y, z, entityliving, stack); @@ -243,7 +243,7 @@ public class SmelteryBlock extends InventoryBlock public void breakBlock (World world, int x, int y, int z, int par5, int par6) //Don't drop inventory { world.removeBlockTileEntity(x, y, z); - } + }*/ @Override public void getSubBlocks (int id, CreativeTabs tab, List list) diff --git a/src/tconstruct/blocks/component/SmelteryScan.java b/src/tconstruct/blocks/component/SmelteryScan.java index 0b074672..88c41d64 100644 --- a/src/tconstruct/blocks/component/SmelteryScan.java +++ b/src/tconstruct/blocks/component/SmelteryScan.java @@ -1,7 +1,6 @@ package tconstruct.blocks.component; import java.util.ArrayList; -import java.util.Iterator; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; @@ -48,13 +47,24 @@ public class SmelteryScan extends TankLayerScan return false; } - protected void addAirBlock (int x, int y, int z) + protected void finalizeStructure () + { + super.finalizeStructure(); + for (CoordTuple coord : airCoords) + { + world.setBlock(coord.x, coord.y, coord.z, TContent.tankAir.blockID); + IServantLogic servant = (IServantLogic) world.getBlockTileEntity(coord.x, coord.y, coord.z); + servant.verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); + } + } + + /*protected void addAirBlock (int x, int y, int z) { super.addAirBlock(x, y, z); world.setBlock(x, y, z, Block.glass.blockID); - } + }*/ - public void cleanup() + /*public void cleanup() { System.out.println("Structure cleanup activated. Air blocks: "+airCoords.size()); super.cleanup(); @@ -66,5 +76,5 @@ public class SmelteryScan extends TankLayerScan CoordTuple coord = (CoordTuple) i.next(); world.setBlockToAir(coord.x, coord.y, coord.z); } - } + }*/ } diff --git a/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java index fa7db123..c72ca7e1 100644 --- a/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -184,6 +184,32 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc updateAirBlocks(slot, itemstack); } } + + @Override + public ItemStack decrStackSize (int slot, int quantity) + { + if (inventory[slot] != null) + { + if (inventory[slot].stackSize <= quantity) + { + ItemStack stack = inventory[slot]; + inventory[slot] = null; + return stack; + } + ItemStack split = inventory[slot].splitStack(quantity); + if (inventory[slot].stackSize == 0) + { + inventory[slot] = null; + } + + updateAirBlocks(slot, inventory[slot]); + return split; + } + else + { + return null; + } + } void updateAirBlocks (int slot, ItemStack itemstack) { diff --git a/src/tconstruct/library/component/TankLayerScan.java b/src/tconstruct/library/component/TankLayerScan.java index 362c211d..da3ecb71 100644 --- a/src/tconstruct/library/component/TankLayerScan.java +++ b/src/tconstruct/library/component/TankLayerScan.java @@ -130,7 +130,7 @@ public class TankLayerScan extends LogicComponent { completeStructure = true; recurseStructureUp(master.yCoord + 1); - sortStructure(); + finalizeStructure(); if (!world.isRemote && debug) { @@ -151,15 +151,9 @@ public class TankLayerScan extends LogicComponent } } - void sortStructure () + protected void finalizeStructure () { Collections.sort(airCoords, new CoordTupleSort()); - if (!world.isRemote) - { - System.out.println("Sorted coords:"); - for (CoordTuple coord : airCoords) - System.out.println(coord.toString()); - } } public boolean isComplete ()