From fa94af0c54559ccf7c964e3cc932506caae67c8b Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Fri, 18 Oct 2013 21:05:59 +0100 Subject: [PATCH 01/15] Fix derp in readNetworkNBT for layer scan --- src/tconstruct/library/component/TankLayerScan.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tconstruct/library/component/TankLayerScan.java b/src/tconstruct/library/component/TankLayerScan.java index 32582d98..b3a929f1 100644 --- a/src/tconstruct/library/component/TankLayerScan.java +++ b/src/tconstruct/library/component/TankLayerScan.java @@ -448,7 +448,7 @@ public class TankLayerScan extends LogicComponent } } - NBTTagList blocks = tags.getTagList("AirLayer"); + NBTTagList blocks = tags.getTagList("Blocks"); if (blocks != null) { blockCoords.clear(); @@ -461,7 +461,7 @@ public class TankLayerScan extends LogicComponent } } - NBTTagList air = tags.getTagList("AirLayer"); + NBTTagList air = tags.getTagList("Air"); if (air != null) { airCoords.clear(); From cc905b63a5f756a367175f6c1475393f79f50db8 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Sat, 19 Oct 2013 08:48:11 +1100 Subject: [PATCH 02/15] Localized wooden armor --- resources/assets/tinker/lang/en_US.lang | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index b5d26810..e3e01a5a 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -240,6 +240,11 @@ item.tconstruct.ArmorPattern.chestplate.name=Chestplate Cast item.tconstruct.ArmorPattern.leggings.name=Leggings Cast item.tconstruct.ArmorPattern.boots.name=Boots Cast +item.tconstruct.helmetWood.name=Wooden Helmet +item.tconstruct.chestplateWood.name=Wooden Chestplate +item.tconstruct.leggingsWood.name=Wooden Leggings +item.tconstruct.bootsWood.name=Wooden Boots + item.tconstruct.jerky.beef.name=Beef Jerky item.tconstruct.jerky.pig.name=Bacon Jerky item.tconstruct.jerky.chicken.name=Chicken Jerky From 6a0ecab0e48f393bd36ae517e8a00fd1b0c8d999 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Fri, 18 Oct 2013 18:10:18 -0400 Subject: [PATCH 03/15] we dont want GT errors ever, wording from sunstrike --- src/tconstruct/util/config/PHConstruct.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 07ab3489..bf2cf0c4 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -383,6 +383,7 @@ public class PHConstruct Configuration gtConfig = new Configuration(gtDyn); gtConfig.load(); gregtech = gtConfig.get("smelting", "tile.anvil.slightlyDamaged", false).getBoolean(false); + TConstruct.logger.severe("Gelatinous iceberg dead ahead! Entering Greggy waters! Abandon hope all ye who enter here! (No, seriously, we don't support GT. Don't report any issues. Thanks.)"); } } From 711bfde22f9ec2a3146ce0787e5802ba5934353c Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Fri, 18 Oct 2013 21:26:53 -0400 Subject: [PATCH 04/15] put back MFR support using version from @skyboy --- .../api/rednet/RedNetConnectionType.java | 10 - graveyard/readme.txt | 1 - .../api/FactoryRegistry.java | 206 ++++++++++-------- .../api/FertilizerType.java | 0 .../minefactoryreloaded/api/HarvestType.java | 0 .../api/IDeepStorageUnit.java | 4 +- .../api/IFactoryFertilizable.java | 0 .../api/IFactoryFertilizer.java | 0 .../api/IFactoryFruit.java | 0 .../api/IFactoryGrindable.java | 17 +- .../api/IFactoryHarvestable.java | 0 .../api/IFactoryPlantable.java | 0 .../api/IFactoryRanchable.java | 7 +- .../api/ILiquidDrinkHandler.java | 0 .../api/IMobEggHandler.java | 0 .../minefactoryreloaded/api/INeedleAmmo.java | 12 + .../api/IRandomMobProvider.java | 0 .../api/ISafariNetHandler.java | 0 .../minefactoryreloaded/api/ISyringe.java | 6 +- .../minefactoryreloaded/api/IToolHammer.java | 0 .../api/IToolHammerAdvanced.java | 0 .../minefactoryreloaded/api/MobDrop.java | 0 .../minefactoryreloaded/api/RanchedItem.java | 68 ++++++ .../minefactoryreloaded/api/RandomMob.java | 0 .../api/rednet/IConnectableRedNet.java | 8 +- .../api/rednet/IRedNetLogicCircuit.java | 0 .../api/rednet/IRedNetNetworkContainer.java | 0 .../api/rednet/IRedNetNoConnection.java | 6 + .../api/rednet/RedNetConnectionType.java | 64 ++++++ .../MineFactoryReloaded.java | 8 +- .../harvestables/HarvestableOreBerry.java | 0 31 files changed, 298 insertions(+), 119 deletions(-) delete mode 100644 graveyard/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java delete mode 100644 graveyard/readme.txt rename graveyard/powercrystals/minefactoryreloaded/api/FarmingRegistry.java => src/powercrystals/minefactoryreloaded/api/FactoryRegistry.java (89%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/FertilizerType.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/HarvestType.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java (83%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/IFactoryFruit.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java (55%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java (79%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/IMobEggHandler.java (100%) create mode 100644 src/powercrystals/minefactoryreloaded/api/INeedleAmmo.java rename {graveyard => src}/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/ISyringe.java (77%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/IToolHammer.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/MobDrop.java (100%) create mode 100644 src/powercrystals/minefactoryreloaded/api/RanchedItem.java rename {graveyard => src}/powercrystals/minefactoryreloaded/api/RandomMob.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java (89%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java (100%) rename {graveyard => src}/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java (100%) create mode 100644 src/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java create mode 100644 src/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java rename {graveyard => src/tconstruct/plugins}/minefactoryreloaded/MineFactoryReloaded.java (86%) rename {graveyard => src/tconstruct/plugins}/minefactoryreloaded/harvestables/HarvestableOreBerry.java (100%) diff --git a/graveyard/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java b/graveyard/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java deleted file mode 100644 index 58b08a46..00000000 --- a/graveyard/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java +++ /dev/null @@ -1,10 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -public enum RedNetConnectionType -{ - None, - CableSingle, - PlateSingle, - CableAll, - PlateAll -} diff --git a/graveyard/readme.txt b/graveyard/readme.txt deleted file mode 100644 index 55a5cd53..00000000 --- a/graveyard/readme.txt +++ /dev/null @@ -1 +0,0 @@ -The ghost of mods past. May they rest in peace and update in explosions. \ No newline at end of file diff --git a/graveyard/powercrystals/minefactoryreloaded/api/FarmingRegistry.java b/src/powercrystals/minefactoryreloaded/api/FactoryRegistry.java similarity index 89% rename from graveyard/powercrystals/minefactoryreloaded/api/FarmingRegistry.java rename to src/powercrystals/minefactoryreloaded/api/FactoryRegistry.java index 1f96f12a..7e2a910e 100644 --- a/graveyard/powercrystals/minefactoryreloaded/api/FarmingRegistry.java +++ b/src/powercrystals/minefactoryreloaded/api/FactoryRegistry.java @@ -1,9 +1,9 @@ package powercrystals.minefactoryreloaded.api; -import java.lang.reflect.Method; - import powercrystals.minefactoryreloaded.api.rednet.IRedNetLogicCircuit; +import java.lang.reflect.Method; + import net.minecraft.item.ItemStack; /** @@ -12,8 +12,11 @@ import net.minecraft.item.ItemStack; * Class used to register plants and other farming-related things with MFR. Will do nothing if MFR does not exist, but your mod should be set to load * after MFR or things may not work properly. * + * To avoid breaking the API, additional FactoryRegistry##s will appear on major MFR versions that contain API additions. On a Minecraft version change, + * these will be rolled back into this class. + * */ -public class FarmingRegistry +public class FactoryRegistry { /** * Registers a plantable object with the Planter. @@ -36,7 +39,7 @@ public class FarmingRegistry e.printStackTrace(); } } - + /** * Registers a harvestable block with the Harvester. * @@ -58,7 +61,7 @@ public class FarmingRegistry e.printStackTrace(); } } - + /** * Registers a fertilizable block with the Fertilizer. * @@ -80,7 +83,7 @@ public class FarmingRegistry e.printStackTrace(); } } - + /** * Registers a fertilizer item Fertilizer. * @@ -102,7 +105,7 @@ public class FarmingRegistry e.printStackTrace(); } } - + /** * Registers a ranchable entity with the Rancher. * @@ -126,7 +129,8 @@ public class FarmingRegistry } /** - * Registers a grindable entity with the Grinder. + * Registers a grindable entity with the Grinder using the new grinder interface. This method will be renamed to the standard "registerGrindable" + * on MC 1.6. * * @param grindable The entity to grind. */ @@ -147,10 +151,33 @@ public class FarmingRegistry } } + /** + * Registers a grindable entity with the Grinder using the new grinder interface. This method will be renamed to the standard "registerGrindable" + * on MC 1.6. + * + * @param grindable The entity to grind. + */ + public static void registerGrinderBlacklist(Class ...ungrindables) + { + try + { + Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); + if(registry != null) + { + Method reg = registry.getMethod("registerGrinderBlacklist", Class[].class); + reg.invoke(registry, (Object[])ungrindables); + } + } + catch(Exception e) + { + e.printStackTrace(); + } + } + /** * Registers a possible output with the sludge boiler. * - * @param weight Likelihood that this item will be produced. Lower means rarer. + * @param weight Likelihood that this item will be produced. Lower means rarer. * @param drop The thing being produced by the sludge boiler. */ public static void registerSludgeDrop(int weight, ItemStack drop) @@ -169,11 +196,11 @@ public class FarmingRegistry e.printStackTrace(); } } - + /** * Registers specific food to use in the Breeder (instead of wheat) for a given mob. * - * @param entityToBreed Entity this food will be used with. + * @param entityToBreed Entity this food will be used with. * @param food The item to use when breeding this entity. */ public static void registerBreederFood(Class entityToBreed, ItemStack food) @@ -192,74 +219,7 @@ public class FarmingRegistry e.printStackTrace(); } } - - /** - * Registers a Safari Net handler to properly serialize a type of mob. - * - * @param handler The Safari Net handler. - */ - public static void registerSafariNetHandler(ISafariNetHandler handler) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerSafariNetHandler", ISafariNetHandler.class); - reg.invoke(registry, handler); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - - /** - * Registers a mob egg handler, which allows the Safari Net to properly change colors. - * - * @param handler The mob egg handler - */ - public static void registerMobEggHandler(IMobEggHandler handler) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerMobEggHandler", IMobEggHandler.class); - reg.invoke(registry, handler); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Allows Rubber Trees to spawn in the specified biome. - * - * @param biome The biome name. - */ - public static void registerRubberTreeBiome(String biome) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerRubberTreeBiome", String.class); - reg.invoke(registry, biome); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - + /** * Bans an entity class from being collected by Safari Nets * @@ -281,7 +241,74 @@ public class FarmingRegistry e.printStackTrace(); } } - + + /** + * Registers a Safari Net handler to properly serialize a type of mob. + * + * @param handler The Safari Net handler. + */ + public static void registerSafariNetHandler(ISafariNetHandler handler) + { + try + { + Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); + if(registry != null) + { + Method reg = registry.getMethod("registerSafariNetHandler", ISafariNetHandler.class); + reg.invoke(registry, handler); + } + } + catch(Exception e) + { + e.printStackTrace(); + } + } + + + /** + * Registers a mob egg handler, which allows the Safari Net to properly change colors. + * + * @param handler The mob egg handler + */ + public static void registerMobEggHandler(IMobEggHandler handler) + { + try + { + Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); + if(registry != null) + { + Method reg = registry.getMethod("registerMobEggHandler", IMobEggHandler.class); + reg.invoke(registry, handler); + } + } + catch(Exception e) + { + e.printStackTrace(); + } + } + + /** + * Allows Rubber Trees to spawn in the specified biome. + * + * @param biome The biome name. + */ + public static void registerRubberTreeBiome(String biome) + { + try + { + Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); + if(registry != null) + { + Method reg = registry.getMethod("registerRubberTreeBiome", String.class); + reg.invoke(registry, biome); + } + } + catch(Exception e) + { + e.printStackTrace(); + } + } + /** * Registers an entity as a possible output from villager random safari nets. Note that the "id" field must be initialized * (i.e. with Entity.addEntityID()) for it to work correctly. @@ -305,7 +332,7 @@ public class FarmingRegistry e.printStackTrace(); } } - + /** * Registers a handler for drinking liquids with the straw. * @@ -328,11 +355,11 @@ public class FarmingRegistry e.printStackTrace(); } } - + /** * Registers a possible output with the laser drill. * - * @param weight Likelihood that this item will be produced. Lower means rarer. + * @param weight Likelihood that this item will be produced. Lower means rarer. * @param drop The thing being produced by the laser drill. */ public static void registerLaserOre(int weight, ItemStack drop) @@ -354,21 +381,22 @@ public class FarmingRegistry /** * Registers a preferred ore with the laser drill. Focuses with the specified color will make the specified ore more likely. - * Note that this will overwrite existing ore preferences - you may want to coordinate with PC before using this one. * Used by MFR itself for vanilla: Black (Coal), Light Blue (Diamond), Lime (Emerald), Yellow (Gold), Brown (Iron), Blue (Lapis), * Red (Redstone), and White (nether quartz). * + * This will replace setLaserPreferredOre on MC 1.6. + * * @param color The color that the preferred ore is being set for. White is 0. * @param ore The ore that will be preferred by the drill when a focus with the specified color is present. */ - public static void setLaserPreferredOre(int color, ItemStack ore) + public static void addLaserPreferredOre(int color, ItemStack ore) { try { Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); if(registry != null) { - Method reg = registry.getMethod("setLaserPreferredOre", int.class, ItemStack.class); + Method reg = registry.getMethod("addLaserPreferredOre", int.class, ItemStack.class); reg.invoke(registry, color, ore); } } @@ -400,7 +428,7 @@ public class FarmingRegistry e.printStackTrace(); } } - + /** * Registers a fruit for the Fruit Picker. * @@ -422,7 +450,7 @@ public class FarmingRegistry e.printStackTrace(); } } - + /** * Registers an entity string as an invalid entry for the autospawner. * See also: {@link net.minecraft.entity.EntityList}'s classToStringMapping and stringToClassMapping. @@ -445,7 +473,7 @@ public class FarmingRegistry e.printStackTrace(); } } - + /** * Registers logic circuit to be usable in the Programmable RedNet Controller. * diff --git a/graveyard/powercrystals/minefactoryreloaded/api/FertilizerType.java b/src/powercrystals/minefactoryreloaded/api/FertilizerType.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/FertilizerType.java rename to src/powercrystals/minefactoryreloaded/api/FertilizerType.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/HarvestType.java b/src/powercrystals/minefactoryreloaded/api/HarvestType.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/HarvestType.java rename to src/powercrystals/minefactoryreloaded/api/HarvestType.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java similarity index 83% rename from graveyard/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java rename to src/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java index ec6c1be4..02d36fae 100644 --- a/graveyard/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java +++ b/src/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java @@ -15,9 +15,9 @@ public interface IDeepStorageUnit void setStoredItemCount(int amount); /** - * Sets the type of the stored item and initializes the number of stored items to count. Will overwrite any existing stored items. + * Sets the type of the stored item and initializes the number of stored items to amount. Will overwrite any existing stored items. */ - void setStoredItemType(int itemID, int meta, int Count); + void setStoredItemType(ItemStack type, int amount); /** * @return The maximum number of items the DSU can hold. diff --git a/graveyard/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java b/src/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java rename to src/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java b/src/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java rename to src/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/IFactoryFruit.java b/src/powercrystals/minefactoryreloaded/api/IFactoryFruit.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/IFactoryFruit.java rename to src/powercrystals/minefactoryreloaded/api/IFactoryFruit.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java b/src/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java similarity index 55% rename from graveyard/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java rename to src/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java index bcc35105..88eef061 100644 --- a/graveyard/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java +++ b/src/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java @@ -3,7 +3,7 @@ package powercrystals.minefactoryreloaded.api; import java.util.List; import java.util.Random; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; /** @@ -11,19 +11,26 @@ import net.minecraft.world.World; * * Defines a grindable entity for the Grinder. */ +@SuppressWarnings("deprecation") public interface IFactoryGrindable { /** - * @return The class that this grindable instance is handling. This must be a subtype of EntityLiving or the entity will never + * @return The class that this grindable instance is handling. This must be a subtype of EntityLivingBase or the entity will never * be noticed by the Grinder. */ public Class getGrindableEntity(); - + /** * @param world The world this entity is in. * @param entity The entity instance being ground. - * @param random A Random instance. + * @param random A Random instance. * @return The drops generated when this entity is killed. */ - public List grind(World world, EntityLiving entity, Random random); + public List grind(World world, EntityLivingBase entity, Random random); + + /** + * @param entity The entity instance being ground. + * @return Whether this entity has been fully processed or not. + */ + public boolean processEntity(EntityLivingBase entity); } diff --git a/graveyard/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java b/src/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java rename to src/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java b/src/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java rename to src/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java b/src/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java similarity index 79% rename from graveyard/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java rename to src/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java index 23fec3b6..36327c53 100644 --- a/graveyard/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java +++ b/src/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java @@ -2,9 +2,8 @@ package powercrystals.minefactoryreloaded.api; import java.util.List; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import net.minecraft.world.World; /** @@ -15,7 +14,7 @@ import net.minecraft.world.World; public interface IFactoryRanchable { /** - * @return The entity being ranched. Must be a subtype of EntityLiving. + * @return The entity being ranched. Must be a subtype of EntityLivingBase. */ public Class getRanchableEntity(); @@ -25,5 +24,5 @@ public interface IFactoryRanchable * @param rancher The rancher instance doing the ranching. Used to access the Rancher's inventory when milking cows, for example. * @return A list of drops. */ - public List ranch(World world, EntityLiving entity, IInventory rancher); + public List ranch(World world, EntityLivingBase entity, IInventory rancher); } diff --git a/graveyard/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java b/src/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java rename to src/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/IMobEggHandler.java b/src/powercrystals/minefactoryreloaded/api/IMobEggHandler.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/IMobEggHandler.java rename to src/powercrystals/minefactoryreloaded/api/IMobEggHandler.java diff --git a/src/powercrystals/minefactoryreloaded/api/INeedleAmmo.java b/src/powercrystals/minefactoryreloaded/api/INeedleAmmo.java new file mode 100644 index 00000000..db061304 --- /dev/null +++ b/src/powercrystals/minefactoryreloaded/api/INeedleAmmo.java @@ -0,0 +1,12 @@ +package powercrystals.minefactoryreloaded.api; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + +public interface INeedleAmmo +{ + public boolean onHitEntity(EntityPlayer owner, Entity hit, double distance); + public void onHitBlock(EntityPlayer owner, World world, int x, int y, int z, int side, double distance); + public float getSpread(); +} diff --git a/graveyard/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java b/src/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java rename to src/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java b/src/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java rename to src/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/ISyringe.java b/src/powercrystals/minefactoryreloaded/api/ISyringe.java similarity index 77% rename from graveyard/powercrystals/minefactoryreloaded/api/ISyringe.java rename to src/powercrystals/minefactoryreloaded/api/ISyringe.java index 5521d451..75cff08d 100644 --- a/graveyard/powercrystals/minefactoryreloaded/api/ISyringe.java +++ b/src/powercrystals/minefactoryreloaded/api/ISyringe.java @@ -1,6 +1,6 @@ package powercrystals.minefactoryreloaded.api; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -18,7 +18,7 @@ public interface ISyringe * @param syringe The syringe ItemStack. * @return True if the entity can be injected by this syringe. */ - public boolean canInject(World world, EntityLiving entity, ItemStack syringe); + public boolean canInject(World world, EntityLivingBase entity, ItemStack syringe); /** * Called to perform an injection. @@ -27,5 +27,5 @@ public interface ISyringe * @param syringe The syringe ItemStack. * @return True if injection was successful. */ - public boolean inject(World world, EntityLiving entity, ItemStack syringe); + public boolean inject(World world, EntityLivingBase entity, ItemStack syringe); } diff --git a/graveyard/powercrystals/minefactoryreloaded/api/IToolHammer.java b/src/powercrystals/minefactoryreloaded/api/IToolHammer.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/IToolHammer.java rename to src/powercrystals/minefactoryreloaded/api/IToolHammer.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java b/src/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java rename to src/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/MobDrop.java b/src/powercrystals/minefactoryreloaded/api/MobDrop.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/MobDrop.java rename to src/powercrystals/minefactoryreloaded/api/MobDrop.java diff --git a/src/powercrystals/minefactoryreloaded/api/RanchedItem.java b/src/powercrystals/minefactoryreloaded/api/RanchedItem.java new file mode 100644 index 00000000..86791cc5 --- /dev/null +++ b/src/powercrystals/minefactoryreloaded/api/RanchedItem.java @@ -0,0 +1,68 @@ +package powercrystals.minefactoryreloaded.api; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +/** + * @author skyboy026 + * + * Defines an ItemStack or a FluidStack that is the result of an entity being ranched + */ +public final class RanchedItem { + private final ItemStack item; + private final FluidStack fluid; + + public RanchedItem(Block item, int amount, int meta) + { + this(new ItemStack(item, amount, meta)); + } + + public RanchedItem(Block item, int amount) + { + this(new ItemStack(item, amount)); + } + + public RanchedItem(Block item) + { + this(new ItemStack(item)); + } + + public RanchedItem(Item item, int amount, int meta) + { + this(new ItemStack(item, amount, meta)); + } + + public RanchedItem(Item item, int amount) + { + this(new ItemStack(item, amount)); + } + + public RanchedItem(Item item) + { + this(new ItemStack(item)); + } + + public RanchedItem(ItemStack item) + { + this.item = item; + fluid = null; + } + + public RanchedItem(FluidStack fluid) + { + this.fluid = fluid; + item = null; + } + + public boolean hasFluid() + { + return item == null & fluid != null; + } + + public Object getResult() + { + return item == null ? fluid : item; + } +} diff --git a/graveyard/powercrystals/minefactoryreloaded/api/RandomMob.java b/src/powercrystals/minefactoryreloaded/api/RandomMob.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/RandomMob.java rename to src/powercrystals/minefactoryreloaded/api/RandomMob.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java b/src/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java similarity index 89% rename from graveyard/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java rename to src/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java index 50ece4cd..3c8529db 100644 --- a/graveyard/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java +++ b/src/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java @@ -4,7 +4,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; /** - * Defines a Block that can connect to RedNet wires. This must be implemented on your Block class. + * Defines a Block that can connect to RedNet cables. This must be implemented on your Block class. * Note that when you implement this, the RedNet network makes several assumptions about your code - * primarily, it will not clamp values to 0 <= x <= 15. This means you must be able to accept any * possible integer without crashing, even negatives. It will also assume that calling the onInput(s)Changed() @@ -12,6 +12,12 @@ import net.minecraftforge.common.ForgeDirection; * output methods in All mode, and will only query the methods contained in this interface in that case. In Single * mode, it will call onInputChanged, and will check for strong power (or weak if in Plate mode) through the vanilla * method calls. + * + * RedNet cables have their subnets indicated to the user by colored bands on the cable. + * The color of a given subnet is the same as the wool with metadata equal to the subnet number. + * For reference: + * 0:White, 1:Orange, 2:Magenta, 3:LightBlue, 4:Yellow, 5:Lime, 6:Pink, 7:Gray, + * 8:LightGray, 9:Cyan, 10:Purple, 11:Blue, 12:Brown, 13:Green, 14:Red, 15:Black */ public interface IConnectableRedNet { diff --git a/graveyard/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java b/src/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java rename to src/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java diff --git a/graveyard/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java b/src/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java similarity index 100% rename from graveyard/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java rename to src/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java diff --git a/src/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java b/src/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java new file mode 100644 index 00000000..8ff95dd4 --- /dev/null +++ b/src/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java @@ -0,0 +1,6 @@ +package powercrystals.minefactoryreloaded.api.rednet; + +public interface IRedNetNoConnection +{ + +} diff --git a/src/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java b/src/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java new file mode 100644 index 00000000..13e6b0e8 --- /dev/null +++ b/src/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java @@ -0,0 +1,64 @@ +package powercrystals.minefactoryreloaded.api.rednet; + +import java.util.HashMap; +import java.util.Map; + +/** + * Defines how RedNet cable connects to a block + * + * None: RedNet will never connect to this block (if this is all you want: use IRedNetNoConnection) + * + * CableSingle: Connections will use the cable renderer with a single band, best used for whole blocks + * PlateSingle: Connections will use the plate renderer with a single band, used for conveyers and rails + * + * CableAll: Connections permit access to all 16 bands + * PlateAll: Connections permit access to all 16 bands + * + * Forced connection modes are best used for decoration blocks: RedNet will not connect normally, but will if the user forces it + * + * ForcedCableSingle: Connections permit access to a single band only when the cable is in forced connection mode + * ForcedPlateSingle: Connections permit access to a single band only when the cable is in forced connection mode + * + * ForcedCableAll: Connections permit access to all 16 bands only when the cable is in forced connection mode + * ForcedPlateAll: Connections permit access to all 16 bands only when the cable is in forced connection mode + */ +public enum RedNetConnectionType +{ + None, // 0 + CableSingle, // 11 + PlateSingle, // 13 + CableAll, // 19 + PlateAll, // 21 + ForcedCableSingle, // 43 + ForcedPlateSingle, // 45 + ForcedCableAll, // 51 + ForcedPlateAll; // 53 + + public final boolean isConnected = this.ordinal() != 0; + public final boolean isSingleSubnet = this.name().endsWith("Single"); + public final boolean isAllSubnets = this.name().endsWith("All"); + public final boolean isConnectionForced = this.name().startsWith("Forced"); + public final boolean isPlate = this.name().contains("Plate"); + public final boolean isCable = this.name().contains("Cable"); + public final short flags = toFlags(isConnected, isCable, isPlate, isSingleSubnet, isAllSubnets, isConnectionForced); + + public static final RedNetConnectionType fromFlags(short flags) + { + return connections.get(flags); + } + + private static final short toFlags(boolean ...flags) + { + short ret = 0; + for (int i = flags.length; i --> 0;) + ret |= (flags[i] ? 1 : 0) << i; + return ret; + } + + private static final Map connections = new HashMap(); + + static { + for (RedNetConnectionType type : RedNetConnectionType.values()) + connections.put(type.flags, type); + } +} diff --git a/graveyard/minefactoryreloaded/MineFactoryReloaded.java b/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java similarity index 86% rename from graveyard/minefactoryreloaded/MineFactoryReloaded.java rename to src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java index ebd564a3..93cc5bb9 100644 --- a/graveyard/minefactoryreloaded/MineFactoryReloaded.java +++ b/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java @@ -6,11 +6,11 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; -import powercrystals.minefactoryreloaded.api.FarmingRegistry; +import powercrystals.minefactoryreloaded.api.FactoryRegistry; import tconstruct.common.TContent; import tconstruct.plugins.minefactoryreloaded.harvestables.HarvestableOreBerry; -@Mod(modid = "TConstruct|CompatMineFactoryReloaded", name = "TConstruct Compat: MFR", version = "0.1", dependencies = "after:MineFactoryReloaded;after:TConstruct") +@Mod(modid = "TConstruct|CompatMineFactoryReloaded", name = "TConstruct Compat: MFR", version = "0.2", dependencies = "after:MineFactoryReloaded;after:TConstruct") @NetworkMod(clientSideRequired = false, serverSideRequired = false) public class MineFactoryReloaded { @@ -26,8 +26,8 @@ public class MineFactoryReloaded { FMLLog.fine("MineFactoryReloaded detected. Registering TConstruct farmables/grindables with MFR's Farming Registry."); - FarmingRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerry.blockID, TContent.oreBerries.itemID, 0)); - FarmingRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerrySecond.blockID, TContent.oreBerries.itemID, 4)); + FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerry.blockID, TContent.oreBerries.itemID, 0)); + FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerrySecond.blockID, TContent.oreBerries.itemID, 4)); /* * Perhaps TC ores should be registered as drops from the MFR Laser Drill here, but I don't know which things would be suitable for that. diff --git a/graveyard/minefactoryreloaded/harvestables/HarvestableOreBerry.java b/src/tconstruct/plugins/minefactoryreloaded/harvestables/HarvestableOreBerry.java similarity index 100% rename from graveyard/minefactoryreloaded/harvestables/HarvestableOreBerry.java rename to src/tconstruct/plugins/minefactoryreloaded/harvestables/HarvestableOreBerry.java From ae5dd4ea4745498c57b7bc95483eacd113bb5dc1 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Sat, 19 Oct 2013 18:32:41 +1100 Subject: [PATCH 05/15] Various fixes/changes - Return false for isAirBlock in TankAirBlock(fixes ability to replace the blocks with lava/water) - Changed tankAir material from Material.air to Material.leaves(fixes ability to replace the blocks with lava/water) - Clean up imports in TankLayerScan removing the import for scala.compat.Platform$ (fixes crash when there is no scala library) - Add wooden armor recipes --- src/tconstruct/blocks/TankAirBlock.java | 2 +- src/tconstruct/common/TContent.java | 9 ++++++++- .../library/component/TankLayerScan.java | 18 +++--------------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/tconstruct/blocks/TankAirBlock.java b/src/tconstruct/blocks/TankAirBlock.java index 37f911ba..69a2b8f6 100644 --- a/src/tconstruct/blocks/TankAirBlock.java +++ b/src/tconstruct/blocks/TankAirBlock.java @@ -94,6 +94,6 @@ public class TankAirBlock extends BlockContainer @Override public boolean isAirBlock(World world, int x, int y, int z) { - return true; + return false; } } diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index d1fd3cfd..a30aab26 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1,5 +1,7 @@ package tconstruct.common; +import net.minecraftforge.oredict.ShapedOreRecipe; + import net.minecraftforge.common.EnumHelper; import cpw.mods.fml.common.*; @@ -414,7 +416,7 @@ public class TContent implements IFuelHandler GameRegistry.registerBlock(castingChannel, CastingChannelItem.class, "CastingChannel"); GameRegistry.registerTileEntity(CastingChannelLogic.class, "CastingChannel"); - tankAir = new TankAirBlock(PHConstruct.airTank, Material.air).setBlockUnbreakable().setUnlocalizedName("tconstruct.tank.air"); + tankAir = new TankAirBlock(PHConstruct.airTank, Material.leaves).setBlockUnbreakable().setUnlocalizedName("tconstruct.tank.air"); GameRegistry.registerBlock(tankAir, "TankAir"); GameRegistry.registerTileEntity(TankAirLogic.class, "tconstruct.tank.air"); @@ -1545,6 +1547,11 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(materials, 1, 25), "sss", "sns", "sss", 'n', new ItemStack(Item.goldNugget), 's', new ItemStack(Item.silk)); GameRegistry.addRecipe(new ItemStack(materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(materials, 1, 25), 'e', new ItemStack(Item.emerald)); //Silky Jewel + GameRegistry.addRecipe(new ShapedOreRecipe(helmetWood, new Object[]{"www", "w w", 'w', "logWood"})); + GameRegistry.addRecipe(new ShapedOreRecipe(chestplateWood, new Object[]{"w w", "www", "www", 'w', "logWood"})); + GameRegistry.addRecipe(new ShapedOreRecipe(leggingsWood, new Object[]{"www", "w w", "w w", 'w', "logWood"})); + GameRegistry.addRecipe(new ShapedOreRecipe(bootsWood, new Object[]{"w w", "w w", 'w', "logWood"})); + //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 1, new ItemStack(materials, 1, 3), 3f); //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 2, new ItemStack(materials, 1, 4), 3f); FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 3, new ItemStack(materials, 1, 9), 0.5f); diff --git a/src/tconstruct/library/component/TankLayerScan.java b/src/tconstruct/library/component/TankLayerScan.java index b3a929f1..e8c376c3 100644 --- a/src/tconstruct/library/component/TankLayerScan.java +++ b/src/tconstruct/library/component/TankLayerScan.java @@ -1,23 +1,11 @@ package tconstruct.library.component; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.HashSet; - +import java.util.*; import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagIntArray; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.*; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.classloading.FMLForgePlugin; -import scala.compat.Platform$; import tconstruct.TConstruct; -import tconstruct.library.util.CoordTuple; -import tconstruct.library.util.CoordTupleSort; -import tconstruct.library.util.IFacingLogic; -import tconstruct.library.util.IMasterLogic; -import tconstruct.library.util.IServantLogic; +import tconstruct.library.util.*; public class TankLayerScan extends LogicComponent { From 76d6544966276508d6700201aaa8479599993daa Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sat, 19 Oct 2013 03:36:39 -0400 Subject: [PATCH 06/15] re-organize MFR plugin to reduce likelyhood of crashes if preloader derps --- .../minefactoryreloaded/MineFactoryReloaded.java | 10 ++-------- .../minefactoryreloaded/mfrRegistering.java | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 src/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java diff --git a/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java b/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java index 93cc5bb9..721bfa93 100644 --- a/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java +++ b/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java @@ -6,11 +6,8 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; -import powercrystals.minefactoryreloaded.api.FactoryRegistry; -import tconstruct.common.TContent; -import tconstruct.plugins.minefactoryreloaded.harvestables.HarvestableOreBerry; -@Mod(modid = "TConstruct|CompatMineFactoryReloaded", name = "TConstruct Compat: MFR", version = "0.2", dependencies = "after:MineFactoryReloaded;after:TConstruct") +@Mod(modid = "TConstruct|CompatMineFactoryReloaded", name = "TConstruct Compat: MFR", version = "0.2", dependencies = "after:MineFactoryReloaded;required-after:TConstruct") @NetworkMod(clientSideRequired = false, serverSideRequired = false) public class MineFactoryReloaded { @@ -25,10 +22,7 @@ public class MineFactoryReloaded try { FMLLog.fine("MineFactoryReloaded detected. Registering TConstruct farmables/grindables with MFR's Farming Registry."); - - FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerry.blockID, TContent.oreBerries.itemID, 0)); - FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerrySecond.blockID, TContent.oreBerries.itemID, 4)); - + mfrRegistering.registerWithMFR(); /* * Perhaps TC ores should be registered as drops from the MFR Laser Drill here, but I don't know which things would be suitable for that. * Syntax: FarmingRegistry.registerLaserOre(int weight, ItemStack droppedStack)); diff --git a/src/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java b/src/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java new file mode 100644 index 00000000..c0ca1473 --- /dev/null +++ b/src/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java @@ -0,0 +1,15 @@ +package tconstruct.plugins.minefactoryreloaded; + +import powercrystals.minefactoryreloaded.api.FactoryRegistry; +import tconstruct.common.TContent; +import tconstruct.plugins.minefactoryreloaded.harvestables.HarvestableOreBerry; + +public class mfrRegistering +{ + public static void registerWithMFR () + { + FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerry.blockID, TContent.oreBerries.itemID, 0)); + FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerrySecond.blockID, TContent.oreBerries.itemID, 4)); + + } +} From 1fadcfbf594547f4d136ab7c121485c55570ebe1 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Sat, 19 Oct 2013 10:55:11 +0100 Subject: [PATCH 07/15] Blacklist Plugins from Preloader. --- src/tconstruct/preloader/ASMInterfaceRepair.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tconstruct/preloader/ASMInterfaceRepair.java b/src/tconstruct/preloader/ASMInterfaceRepair.java index 1feec95e..df6b36a3 100644 --- a/src/tconstruct/preloader/ASMInterfaceRepair.java +++ b/src/tconstruct/preloader/ASMInterfaceRepair.java @@ -25,7 +25,7 @@ public class ASMInterfaceRepair implements IClassTransformer { @Override public byte[] transform(String name, String transformedName, byte[] bytes) { - if ( name.startsWith( "tconstruct." ) && ! name.startsWith( "tconstruct.preloader." ))// && !isBlacklisted(name) ) + if ( name.startsWith( "tconstruct." ) && !isBlacklisted(name) ) { ClassReader cr = new ClassReader(bytes); ClassNode cn = new ClassNode(); @@ -59,10 +59,11 @@ public class ASMInterfaceRepair implements IClassTransformer { } // Used in transform() above. - /*private boolean isBlacklisted( String path ) + private boolean isBlacklisted( String path ) { - return path.startsWith( "tconstruct.plugins.minefactoryreloaded." ); - }*/ + return path.startsWith( "tconstruct.plugins." ) + || path.startsWith("tconstruct.preloader."); + } private boolean isClassAvailable( String inf ) { From 1115fe8c7d23358eb77ce802bb711dd85ff125ae Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Sat, 19 Oct 2013 22:55:38 +1100 Subject: [PATCH 08/15] Improved fluid height calculation expression... ...to properly respect maxHeight --- src/tconstruct/client/block/SearedRender.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/tconstruct/client/block/SearedRender.java b/src/tconstruct/client/block/SearedRender.java index d09c9890..7db88433 100644 --- a/src/tconstruct/client/block/SearedRender.java +++ b/src/tconstruct/client/block/SearedRender.java @@ -185,7 +185,9 @@ public class SearedRender implements ISimpleBlockRenderingHandler } } - float height = logic.getLiquidAmount() / (logic.getCapacity() * 1.03F) / 16F; + float percent = (float)logic.getLiquidAmount() / (float)logic.getCapacity(); + float height = percent * (maxHeight - minHeight); + //float height = logic.getLiquidAmount() / (logic.getCapacity() * 1.03F) / 16F; renderer.setRenderBounds(minX, minHeight, minZ, maxX, minHeight + height, maxZ); Fluid fluid = logic.liquid.getFluid(); @@ -402,7 +404,10 @@ public class SearedRender implements ISimpleBlockRenderingHandler maxZ = rec.fluidRenderProperties.maxZ; } } - float height = (logic.getLiquidAmount() / (logic.getCapacity() * 1.05F) * 0.6875F) / maxHeight; + float percent = (float)logic.getLiquidAmount() / (float)logic.getCapacity(); + float height = percent * (maxHeight - minHeight); + + //float height = (logic.getLiquidAmount() / (logic.getCapacity() * 1.05F) * 0.6875F) / maxHeight; renderer.setRenderBounds(minX, minHeight, minZ, maxX, minHeight + height, maxZ); Fluid fluid = logic.liquid.getFluid(); From c7938cc714ef4493dfdbe36b2960fc42e39dca50 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Sat, 19 Oct 2013 23:20:57 +1100 Subject: [PATCH 09/15] FluidRenderProperties for creating armor casts --- src/tconstruct/common/TContent.java | 20 +++++++++++-------- .../library/client/FluidRenderProperties.java | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index a30aab26..709d1598 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1,5 +1,9 @@ package tconstruct.common; +import tconstruct.library.client.FluidRenderProperties; + +import tconstruct.library.client.FluidRenderProperties.Applications; + import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.common.EnumHelper; @@ -1291,14 +1295,14 @@ public class TContent implements IFuelHandler basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender //Armor casts - basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 0), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(helmetWood), 50); - basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 0), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(helmetWood), 50); - basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 1), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(chestplateWood), 50); - basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(chestplateWood), 50); - basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 2), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(leggingsWood), 50); - basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 2), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(leggingsWood), 50); - basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 3), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(bootsWood), 50); - basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 3), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(bootsWood), 50); + basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 0), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(helmetWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN)); + basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 0), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(helmetWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN)); + basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 1), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(chestplateWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN)); + basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(chestplateWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN)); + basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 2), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(leggingsWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN)); + basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 2), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(leggingsWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN)); + basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 3), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(bootsWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN)); + basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, 3), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10), new ItemStack(bootsWood), 50, new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN)); //TODO TEST // basinCasting.addCastingRecipe(new ItemStack(armorTest), new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 24), new ItemStack(armorPattern, 1, 0), false, 100, new FluidRenderProperties(0.5F, 0.575F, 0.15F, 0.85F, 0.15F, 0.85F)); diff --git a/src/tconstruct/library/client/FluidRenderProperties.java b/src/tconstruct/library/client/FluidRenderProperties.java index bba9e774..b31f3644 100644 --- a/src/tconstruct/library/client/FluidRenderProperties.java +++ b/src/tconstruct/library/client/FluidRenderProperties.java @@ -40,7 +40,7 @@ public class FluidRenderProperties { public static enum Applications { TABLE(0.9375F, 1F, 0.0625F, 0.9375F, 0.0625F, 0.9375F), BASIN(0.25F, 0.95F, 0.0625F, 0.9375F, 0.0625F, 0.9375F); - float minHeight, maxHeight, minX, maxX, minZ, maxZ; + public float minHeight, maxHeight, minX, maxX, minZ, maxZ; Applications(float minHeight, float maxHeight, float minX, float maxX, float minZ, float maxZ) { this.minHeight = minHeight; From 6f6932989e9e69c92f631906bb1e1ae0a71c210f Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Sat, 19 Oct 2013 14:07:28 +0100 Subject: [PATCH 10/15] Update mcmod.info to reflect new repo --- resources/mcmod.info | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/mcmod.info b/resources/mcmod.info index 5a094e7f..29c7739e 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -10,7 +10,7 @@ "authors": [ "mDiyo", "fuj1n", "ProgWML6", "Sunstrike" ], - "credits": "Ecu", + "credits": "Slime Knights, EcuTruin", "logoFile": "", "screenshots": [], "parent":"", @@ -22,12 +22,12 @@ "description": "Preloader for Tinkers Construct", "version": "0.0.1", "mcversion": "@MCVERSION@", - "url": "https://github.com/mDiyo/TinkersConstruct/tree/master/src/tconstruct/preloader", + "url": "https://github.com/SlimeKnights/TinkersConstruct/tree/master/src/tconstruct/preloader", "updateUrl": "", "authors": [ - "AlgorithmX2", "Sunstrike" + "Sunstrike", "Slime Knights" ], - "credits": "", + "credits": "AlgorithmX2 (ASMInterfaceRepair)", "logoFile": "", "screenshots": [], "parent":"", @@ -44,7 +44,7 @@ "authors": [ "mDiyo", "fuj1n", "ProgWML6", "Sunstrike" ], - "credits": "", + "credits": "Slime Knights", "logoFile": "", "screenshots": [], "parent":"TConstruct", @@ -63,7 +63,7 @@ "authors": [ "mDiyo", "fuj1n", "ProgWML6", "Sunstrike" ], - "credits": "", + "credits": "Slime Knights", "logoFile": "", "screenshots": [], "parent":"TConstruct", From 830926e9c48b929171dce629f0b200d6cf85ab35 Mon Sep 17 00:00:00 2001 From: Alexander Behrhof Date: Sat, 19 Oct 2013 09:39:21 -0400 Subject: [PATCH 11/15] Update capes to reflect new repo. --- capes.txt | 32 +++++++++---------- .../client/event/EventCloakRender.java | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/capes.txt b/capes.txt index 812ef917..857867bc 100644 --- a/capes.txt +++ b/capes.txt @@ -1,51 +1,51 @@ -mDiyo:https://dl.dropboxusercontent.com/u/42769935/mCape.png +SlimeKnights:https://dl.dropboxusercontent.com/u/42769935/mCape.png fuj1n:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png progwml6:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png _Sunstrike:http://talon.sunstrike.io/files/sun_cape.png Fudgy_Fetus:https://dl.dropboxusercontent.com/u/27415688/fudgecape.png Vexatos:https://dl.dropboxusercontent.com/u/57704711/Dokumente/Speziell/Minecraft/Public/TCape.png -pillbox:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_orange.png -Hysting:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_blue.png -Xythyl:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_blue.png -andrejsavikin:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_blue.png +pillbox:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_orange.png +Hysting:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_blue.png +Xythyl:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_blue.png +andrejsavikin:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_blue.png alexbegt:https://dl.dropboxusercontent.com/u/48633261/cape.png -DentedLeftFender:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_green.png +DentedLeftFender:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_green.png Pokefenn:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png sondrex76:http://i.imgur.com/a7QMfjc.png Steelflameblade:http://i.imgur.com/pz1O4pe.png -elkillo:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_green.png -Habselaar:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_green.png +elkillo:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_green.png +Habselaar:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_green.png LordDarkona:http://i.imgur.com/MY4RmgO.png master801:https://dl.dropboxusercontent.com/u/90842632/Ender-Cape.png Zerokyuuni:https://dl.dropboxusercontent.com/u/76684489/zerocape.png -Frosty_Chicken:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_green.png -EntityOmega:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_green.png -skedone:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_green.png +Frosty_Chicken:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_green.png +EntityOmega:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_green.png +skedone:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_green.png type1ninja:https://dl.dropboxusercontent.com/s/0ufr1gtqktt1nl2/JeffCape.png turbeauke:http://i.imgur.com/XdOIone.png Nieue:http://i.imgur.com/8c5yUgX.png -starr274:https://github.com/mDiyo/TinkersConstruct/blob/master/capes/default_gray.png +starr274:https://github.com/SlimeKnights/TinkersConstruct/blob/master/capes/default_gray.png zeflap:http://i.imgur.com/6OhKrVE.png kendfinger:https://dl.dropboxusercontent.com/u/48633261/cape.png GameGeek1998:http://i.imgur.com/hiMFLXY.png fumoffu616:https://dl.dropboxusercontent.com/s/f70j8xfwax1p0t5/myeah.png 7X_star:http://i.imgur.com/ebQ4IvF.png -TheNinjaM:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_green.png +TheNinjaM:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_green.png 1Enderman10:http://i.imgur.com/SGm6cd0.png Lance_Bombardier:http://i.imgur.com/ueHSGf4.png Schluck123:http://i.imgur.com/a7QMfjc.png -redblackdragon3:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_red.png +redblackdragon3:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_red.png xXThunderstarXx:http://i.imgur.com/zJgdW3C.png tonius11:https://dl.dropboxusercontent.com/s/a05r5c68e91dk2h/endercape.png Leilana:http://i.imgur.com/lMXcbre.png evaluno2:http://i.imgur.com/YYqlRRp.png andypie1010:http://oi41.tinypic.com/mlj9jm.jpg -hayden_swanick:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_orange.png +hayden_swanick:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_orange.png PeggleFrank:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png the_j485:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png dgdas12:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png SatanicSanta:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png GPuzzle:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png -ajloveslily14:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_blue.png +ajloveslily14:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_blue.png multisofteis:http://i.imgur.com/AgGBsX8.png ----------------------------------------FINALISED - ONLY ALLOW REMOVAL OF CAPES---------------------------------------- diff --git a/src/tconstruct/client/event/EventCloakRender.java b/src/tconstruct/client/event/EventCloakRender.java index 6cb38d1e..0fe8d648 100644 --- a/src/tconstruct/client/event/EventCloakRender.java +++ b/src/tconstruct/client/event/EventCloakRender.java @@ -13,7 +13,7 @@ import net.minecraftforge.event.ForgeSubscribe; public class EventCloakRender { - private final String serverLocation = "https://raw.github.com/mDiyo/TinkersConstruct/master/capes.txt"; + private final String serverLocation = "https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes.txt"; private final int timeout = 1000; private static final Graphics TEST_GRAPHICS = new BufferedImage(128, 128, BufferedImage.TYPE_INT_RGB).getGraphics(); From a2b9d231e72a509297cbf066c722bc5b865c5518 Mon Sep 17 00:00:00 2001 From: Alexander Behrhof Date: Sat, 19 Oct 2013 09:40:45 -0400 Subject: [PATCH 12/15] Fixing the mDiyo user being removed :) --- capes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capes.txt b/capes.txt index 857867bc..5df07bac 100644 --- a/capes.txt +++ b/capes.txt @@ -1,4 +1,4 @@ -SlimeKnights:https://dl.dropboxusercontent.com/u/42769935/mCape.png +mDiyo:https://dl.dropboxusercontent.com/u/42769935/mCape.png fuj1n:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png progwml6:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png _Sunstrike:http://talon.sunstrike.io/files/sun_cape.png From a4c2fec3dfac8f30dce58e6b96d8fe1ebe89ea07 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sat, 19 Oct 2013 09:42:15 -0400 Subject: [PATCH 13/15] force back in lost commit of mfr plugin refactoring to reduce likelyhood of crashes --- .../plugins/minefactoryreloaded/MineFactoryReloaded.java | 2 +- src/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java b/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java index 721bfa93..f9c62998 100644 --- a/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java +++ b/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java @@ -23,7 +23,7 @@ public class MineFactoryReloaded { FMLLog.fine("MineFactoryReloaded detected. Registering TConstruct farmables/grindables with MFR's Farming Registry."); mfrRegistering.registerWithMFR(); - /* + /* * Perhaps TC ores should be registered as drops from the MFR Laser Drill here, but I don't know which things would be suitable for that. * Syntax: FarmingRegistry.registerLaserOre(int weight, ItemStack droppedStack)); * Currently used weights are from about 50 (emerald) to 175 (coal). diff --git a/src/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java b/src/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java index c0ca1473..a727fcf3 100644 --- a/src/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java +++ b/src/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java @@ -10,6 +10,6 @@ public class mfrRegistering { FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerry.blockID, TContent.oreBerries.itemID, 0)); FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerrySecond.blockID, TContent.oreBerries.itemID, 4)); - + } } From 2c021e9f95f077f04938768894c3af6bd76b6dbc Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sat, 19 Oct 2013 10:02:00 -0400 Subject: [PATCH 14/15] refactor waila plugin to reduce likelihood of crashes --- .../waila/CastingChannelDataProvider.java | 2 +- .../plugins/waila/SearedTankDataProvider.java | 2 +- .../plugins/waila/SmelteryDataProvider.java | 2 +- src/tconstruct/plugins/waila/Waila.java | 29 +++---------------- 4 files changed, 7 insertions(+), 28 deletions(-) diff --git a/src/tconstruct/plugins/waila/CastingChannelDataProvider.java b/src/tconstruct/plugins/waila/CastingChannelDataProvider.java index 1af0dc7f..a09f743b 100644 --- a/src/tconstruct/plugins/waila/CastingChannelDataProvider.java +++ b/src/tconstruct/plugins/waila/CastingChannelDataProvider.java @@ -27,7 +27,7 @@ public class CastingChannelDataProvider implements IWailaDataProvider { CastingChannelLogic te = (CastingChannelLogic)accessor.getTileEntity(); if (te.liquid != null && te.liquid.amount > 0) { FluidStack fs = te.liquid; - currenttip.add("Liquid: " + Waila.fluidNameHelper(fs)); + currenttip.add("Liquid: " + WailaRegistrar.fluidNameHelper(fs)); currenttip.add("Amount: " + fs.amount + "/" + te.getCapacity()); } else { currenttip.add("§oEmpty"); // "§o" == Italics diff --git a/src/tconstruct/plugins/waila/SearedTankDataProvider.java b/src/tconstruct/plugins/waila/SearedTankDataProvider.java index 29906c5a..9bf7972b 100644 --- a/src/tconstruct/plugins/waila/SearedTankDataProvider.java +++ b/src/tconstruct/plugins/waila/SearedTankDataProvider.java @@ -27,7 +27,7 @@ public class SearedTankDataProvider implements IWailaDataProvider { LavaTankLogic te = (LavaTankLogic)accessor.getTileEntity(); if (te.containsFluid()) { FluidStack fs = te.tank.getFluid(); - currenttip.add("Liquid: " + Waila.fluidNameHelper(fs)); + currenttip.add("Liquid: " + WailaRegistrar.fluidNameHelper(fs)); currenttip.add("Amount: " + fs.amount + "/" + te.tank.getCapacity()); } else { currenttip.add("§oEmpty"); // "§o" == Italics diff --git a/src/tconstruct/plugins/waila/SmelteryDataProvider.java b/src/tconstruct/plugins/waila/SmelteryDataProvider.java index 2ed494fb..30cbf378 100644 --- a/src/tconstruct/plugins/waila/SmelteryDataProvider.java +++ b/src/tconstruct/plugins/waila/SmelteryDataProvider.java @@ -32,7 +32,7 @@ public class SmelteryDataProvider implements IWailaDataProvider { } else { for (int i = 0; i < fls.size(); i++) { FluidStack st = fls.get(i); - currenttip.add(Waila.fluidNameHelper(st) + " (" + st.amount + "mB)"); + currenttip.add(WailaRegistrar.fluidNameHelper(st) + " (" + st.amount + "mB)"); } } } else { diff --git a/src/tconstruct/plugins/waila/Waila.java b/src/tconstruct/plugins/waila/Waila.java index 82b24c96..701fc07a 100644 --- a/src/tconstruct/plugins/waila/Waila.java +++ b/src/tconstruct/plugins/waila/Waila.java @@ -7,13 +7,7 @@ import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.network.NetworkMod; -import mcp.mobius.waila.api.IWailaRegistrar; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import tconstruct.blocks.LavaTankBlock; -import tconstruct.blocks.SmelteryBlock; -import tconstruct.blocks.logic.CastingChannelLogic; + import java.util.logging.Logger; @@ -33,27 +27,12 @@ public class Waila { return; } try { logger.info("Waila detected. Registering TConstruct tank blocks with Waila registry."); - - FMLInterModComms.sendMessage("Waila", "register", "tconstruct.plugins.waila.Waila.wailaCallback"); + + FMLInterModComms.sendMessage("Waila", "register", "tconstruct.plugins.waila.WailaRegistrar.wailaCallback"); } catch (Exception e) { e.printStackTrace(); } } - public static void wailaCallback(IWailaRegistrar registrar) { - logger.info("Got registrar: " + registrar); - - // Tanks - registrar.registerBodyProvider(new SearedTankDataProvider(), LavaTankBlock.class); - registrar.registerBodyProvider(new CastingChannelDataProvider(), CastingChannelLogic.class); - //registrar.registerBodyProvider(new EssenceExtractorDataProvider(), EssenceExtractor.class); - - // Smeltery - registrar.registerBodyProvider(new SmelteryDataProvider(), SmelteryBlock.class); - } - - public static String fluidNameHelper(FluidStack f) { - return StatCollector.translateToLocal(FluidRegistry.getFluidName(f)); - } - + } From b507ea7470927b9bff3480ca8a4285be661648ff Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sat, 19 Oct 2013 10:23:56 -0400 Subject: [PATCH 15/15] note to self get better git client --- .../plugins/waila/WailaRegistrar.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/tconstruct/plugins/waila/WailaRegistrar.java diff --git a/src/tconstruct/plugins/waila/WailaRegistrar.java b/src/tconstruct/plugins/waila/WailaRegistrar.java new file mode 100644 index 00000000..a69bf9ec --- /dev/null +++ b/src/tconstruct/plugins/waila/WailaRegistrar.java @@ -0,0 +1,29 @@ +package tconstruct.plugins.waila; + +import mcp.mobius.waila.api.IWailaRegistrar; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import tconstruct.blocks.LavaTankBlock; +import tconstruct.blocks.SmelteryBlock; +import tconstruct.blocks.logic.CastingChannelLogic; + +public class WailaRegistrar +{ + public static void wailaCallback(IWailaRegistrar registrar) { + Waila.logger.info("Got registrar: " + registrar); + + // Tanks + registrar.registerBodyProvider(new SearedTankDataProvider(), LavaTankBlock.class); + registrar.registerBodyProvider(new CastingChannelDataProvider(), CastingChannelLogic.class); + //registrar.registerBodyProvider(new EssenceExtractorDataProvider(), EssenceExtractor.class); + + // Smeltery + registrar.registerBodyProvider(new SmelteryDataProvider(), SmelteryBlock.class); + } + + public static String fluidNameHelper(FluidStack f) { + return StatCollector.translateToLocal(FluidRegistry.getFluidName(f)); + } + +}