diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml
index 82332836..a6870938 100644
--- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml
+++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml
@@ -236,6 +236,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2964,40 +2996,44 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
-
+
-
+
diff --git a/resources/assets/enderio/config/VatRecipes_Core.xml b/resources/assets/enderio/config/VatRecipes_Core.xml
index 284f80ad..302e91f0 100644
--- a/resources/assets/enderio/config/VatRecipes_Core.xml
+++ b/resources/assets/enderio/config/VatRecipes_Core.xml
@@ -127,6 +127,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang
index ab8f4aa4..83ed95c5 100644
--- a/resources/assets/enderio/lang/en_US.lang
+++ b/resources/assets/enderio/lang/en_US.lang
@@ -127,6 +127,8 @@ enderio.conduitBinder.name=Conduit Binder
enderio.binderComposite.name=Binder Composite
enderio.phasedIronNugget.name=Pulsating Iron Nugget
tile.blockDarkIronBars.name=Dark Iron Bars
+tile.blockSoulariumBars.name=Soularium Bars
+tile.blockEndSteelBars.name=End Steel Bars
tile.blockEndermanSkull.name=Enderman Skull
tile.blockEndermanSkull.base.name=Enderman Head
tile.blockEndermanSkull.reanimated.name=Reanimated Enderman Head
@@ -173,6 +175,14 @@ fluid.cloud_seed_concentrated=Concentrated Cloud Seed
tile.fluid.cloud_seed_concentrated.name=Concentrated Cloud Seed
item.bucketCloud_seed_concentrated.name=Concentrated Cloud Seed Bucket
+fluid.ender_distillation=Dew of the Void
+tile.fluid.ender_distillation.name=Dew of the Void
+item.bucketEnder_distillation.name=Dew of the Void Bucket
+
+fluid.vapor_of_levity=Vapor of Levity
+tile.fluid.vapor_of_levity.name=Vapor of Levity
+item.bucketVapor_of_levity.name=Vapor of Levity Bucket
+
fluid.eio.xpjuice=Liquid XP
tile.fluid.eio.xpjuice.name=Liquid XP
item.bucketXpjuice.name=XP Bucket
@@ -240,7 +250,23 @@ enderio.darkSteel.name=Dark Steel
enderio.soularium.name=Soularium
enderio.endSteel.name=End Steel
enderio.endSteelNugget.name=End Steel Nugget
+enderio.precientCrystal.name=Precient Crystal
+enderio.pulsatingPowder.name=Grains of Piezallity
+enderio.vibrantPowder.name=Grains of Vibrancy
+enderio.enderCrystalPowder.name=Grains of the End
+enderio.precientPowder.name=Grains of Prescience
+//Balls
+enderio.electricalSteel_ball.name=Electrical Steel Ball
+enderio.energeticAlloy_ball.name=Energetic Alloy Ball
+enderio.phasedGold_ball.name=Vibrant Alloy Ball
+enderio.redstoneAlloy_ball.name=Redstone Alloy Ball
+enderio.conductiveIron_ball.name=Conductive Iron Ball
+enderio.phasedIron_ball.name=Pulsating Iron Ball
+enderio.vibrantNugget_ball.name=Vibrant Alloy Nugget Ball
+enderio.darkSteel_ball.name=Dark Steel Ball
+enderio.soularium_ball.name=Soularium Ball
+enderio.endSteel_ball.name=End Steel Ball
tile.blockIngotStorage.name=Ingot Storage
tile.enderio.electricalSteel.name=Electrical Steel Block
@@ -299,6 +325,7 @@ tile.blockAlloySmelter.tooltip.detailed.line5=speed and energy storage
tile.blockSolarPanel.name=Photovoltaic Cell
tile.blockSolarPanel.advanced.name=Advanced Photovoltaic Cell
+tile.blockSolarPanel.vibrant.name=Vibrant Photovoltaic Cell
tile.blockSolarPanel.tooltip.common.line1=Solar Power!
tile.blockSolarPanel.tooltip.detailed.line1=Produces power during daylight hours
tile.blockSolarPanel.tooltip.detailed.line2=Must have a clear line of sight to
@@ -428,6 +455,16 @@ tile.blockZombieGenerator.tooltip.detailed.line2=to generate power
enderio.zombieGenerator.fuelTank=Nutrient Tank
enderio.gui.fluid.minReq=%s Required for activation
+tile.blockFrankenzombieGenerator.name=Frank'N'Zombie Generator
+tile.blockFrankenzombieGenerator.tooltip.detailed.line1=Consumes Nutrient Distillation
+tile.blockFrankenzombieGenerator.tooltip.detailed.line2=to generate even more power
+enderio.frankenzombieGenerator.fuelTank=Nutrient Tank
+
+tile.blockEnderGenerator.name=Ender Generator
+tile.blockZombieGenerator.tooltip.detailed.line1=Consumes Dew of the Void
+tile.blockZombieGenerator.tooltip.detailed.line2=to generate power
+enderio.enderGenerator.fuelTank=Void Tank
+
tile.blockKillerJoe.name=Killer Joe
tile.blockKillerJoe.tooltip.detailed.line1=Attacks nearby creatures when
tile.blockKillerJoe.tooltip.detailed.line2=supplied with a sword and
diff --git a/resources/assets/enderio/models/EnderJar.png b/resources/assets/enderio/models/EnderJar.png
new file mode 100644
index 00000000..b7e377e1
Binary files /dev/null and b/resources/assets/enderio/models/EnderJar.png differ
diff --git a/resources/assets/enderio/models/FrankenzombieJar.png b/resources/assets/enderio/models/FrankenzombieJar.png
new file mode 100644
index 00000000..ff7b535f
Binary files /dev/null and b/resources/assets/enderio/models/FrankenzombieJar.png differ
diff --git a/resources/assets/enderio/textures/blocks/blockEndSteelBars.png b/resources/assets/enderio/textures/blocks/blockEndSteelBars.png
new file mode 100644
index 00000000..ff79bdfd
Binary files /dev/null and b/resources/assets/enderio/textures/blocks/blockEndSteelBars.png differ
diff --git a/resources/assets/enderio/textures/blocks/blockSoulariumBars.png b/resources/assets/enderio/textures/blocks/blockSoulariumBars.png
new file mode 100644
index 00000000..a5d4d5f5
Binary files /dev/null and b/resources/assets/enderio/textures/blocks/blockSoulariumBars.png differ
diff --git a/resources/assets/enderio/textures/blocks/ender_distillation_flow.png b/resources/assets/enderio/textures/blocks/ender_distillation_flow.png
new file mode 100644
index 00000000..53d33aac
Binary files /dev/null and b/resources/assets/enderio/textures/blocks/ender_distillation_flow.png differ
diff --git a/resources/assets/enderio/textures/blocks/ender_distillation_flow.png.mcmeta b/resources/assets/enderio/textures/blocks/ender_distillation_flow.png.mcmeta
new file mode 100644
index 00000000..4f0718ac
--- /dev/null
+++ b/resources/assets/enderio/textures/blocks/ender_distillation_flow.png.mcmeta
@@ -0,0 +1,3 @@
+{
+ "animation": {}
+}
\ No newline at end of file
diff --git a/resources/assets/enderio/textures/blocks/ender_distillation_still.png b/resources/assets/enderio/textures/blocks/ender_distillation_still.png
new file mode 100644
index 00000000..5a7fd05e
Binary files /dev/null and b/resources/assets/enderio/textures/blocks/ender_distillation_still.png differ
diff --git a/resources/assets/enderio/textures/blocks/ender_distillation_still.png.mcmeta b/resources/assets/enderio/textures/blocks/ender_distillation_still.png.mcmeta
new file mode 100644
index 00000000..0645f48c
--- /dev/null
+++ b/resources/assets/enderio/textures/blocks/ender_distillation_still.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation": {
+ "frametime": 2
+ }
+}
diff --git a/resources/assets/enderio/textures/blocks/solarPanelAdvancedBorder.png b/resources/assets/enderio/textures/blocks/solarPanelAdvancedBorder.png
index f73cba2c..03f9a937 100644
Binary files a/resources/assets/enderio/textures/blocks/solarPanelAdvancedBorder.png and b/resources/assets/enderio/textures/blocks/solarPanelAdvancedBorder.png differ
diff --git a/resources/assets/enderio/textures/blocks/solarPanelAdvancedSide.png b/resources/assets/enderio/textures/blocks/solarPanelAdvancedSide.png
index c234e11a..c6fc9cae 100644
Binary files a/resources/assets/enderio/textures/blocks/solarPanelAdvancedSide.png and b/resources/assets/enderio/textures/blocks/solarPanelAdvancedSide.png differ
diff --git a/resources/assets/enderio/textures/blocks/solarPanelBorder.png b/resources/assets/enderio/textures/blocks/solarPanelBorder.png
index a6ec92e2..ae5615e2 100644
Binary files a/resources/assets/enderio/textures/blocks/solarPanelBorder.png and b/resources/assets/enderio/textures/blocks/solarPanelBorder.png differ
diff --git a/resources/assets/enderio/textures/blocks/solarPanelSide.png b/resources/assets/enderio/textures/blocks/solarPanelSide.png
index e5c00c34..16c894f1 100644
Binary files a/resources/assets/enderio/textures/blocks/solarPanelSide.png and b/resources/assets/enderio/textures/blocks/solarPanelSide.png differ
diff --git a/resources/assets/enderio/textures/blocks/solarPanelTop.png b/resources/assets/enderio/textures/blocks/solarPanelTop.png
index a60c8f93..24e14b63 100644
Binary files a/resources/assets/enderio/textures/blocks/solarPanelTop.png and b/resources/assets/enderio/textures/blocks/solarPanelTop.png differ
diff --git a/resources/assets/enderio/textures/blocks/solarPanelVibrantBorder.png b/resources/assets/enderio/textures/blocks/solarPanelVibrantBorder.png
new file mode 100644
index 00000000..4d57072d
Binary files /dev/null and b/resources/assets/enderio/textures/blocks/solarPanelVibrantBorder.png differ
diff --git a/resources/assets/enderio/textures/blocks/solarPanelVibrantSide.png b/resources/assets/enderio/textures/blocks/solarPanelVibrantSide.png
new file mode 100644
index 00000000..91280292
Binary files /dev/null and b/resources/assets/enderio/textures/blocks/solarPanelVibrantSide.png differ
diff --git a/resources/assets/enderio/textures/blocks/solarPanelVibrantTop.png b/resources/assets/enderio/textures/blocks/solarPanelVibrantTop.png
new file mode 100644
index 00000000..702a68c9
Binary files /dev/null and b/resources/assets/enderio/textures/blocks/solarPanelVibrantTop.png differ
diff --git a/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png b/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png
new file mode 100644
index 00000000..291badfb
Binary files /dev/null and b/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png differ
diff --git a/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png.mcmeta b/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png.mcmeta
new file mode 100644
index 00000000..37d84f6a
--- /dev/null
+++ b/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png.mcmeta
@@ -0,0 +1,4 @@
+{
+ "animation": {
+ }
+}
\ No newline at end of file
diff --git a/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png b/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png
new file mode 100644
index 00000000..ca17a702
Binary files /dev/null and b/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png differ
diff --git a/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta b/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta
new file mode 100644
index 00000000..0645f48c
--- /dev/null
+++ b/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation": {
+ "frametime": 2
+ }
+}
diff --git a/resources/assets/enderio/textures/gui/23/zombieGenerator.png b/resources/assets/enderio/textures/gui/23/zombieGenerator.png
index d6518d7a..47e196be 100644
Binary files a/resources/assets/enderio/textures/gui/23/zombieGenerator.png and b/resources/assets/enderio/textures/gui/23/zombieGenerator.png differ
diff --git a/resources/assets/enderio/textures/items/bucketEnder_distillation.png b/resources/assets/enderio/textures/items/bucketEnder_distillation.png
new file mode 100644
index 00000000..b195c778
Binary files /dev/null and b/resources/assets/enderio/textures/items/bucketEnder_distillation.png differ
diff --git a/resources/assets/enderio/textures/items/bucketVapor_of_levity.png b/resources/assets/enderio/textures/items/bucketVapor_of_levity.png
new file mode 100644
index 00000000..c70c4db5
Binary files /dev/null and b/resources/assets/enderio/textures/items/bucketVapor_of_levity.png differ
diff --git a/resources/assets/enderio/textures/items/conductiveGrindingBall.png b/resources/assets/enderio/textures/items/conductiveIronGrindingBall.png
similarity index 100%
rename from resources/assets/enderio/textures/items/conductiveGrindingBall.png
rename to resources/assets/enderio/textures/items/conductiveIronGrindingBall.png
diff --git a/resources/assets/enderio/textures/items/darkSteelGrindingBall.png b/resources/assets/enderio/textures/items/darkSteelGrindingBall.png
new file mode 100644
index 00000000..54f5d3de
Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteelGrindingBall.png differ
diff --git a/resources/assets/enderio/textures/items/electricalGrindingBall.png b/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png
similarity index 100%
rename from resources/assets/enderio/textures/items/electricalGrindingBall.png
rename to resources/assets/enderio/textures/items/electricalSteelGrindingBall.png
diff --git a/resources/assets/enderio/textures/items/electricalGrindingBall.png.mcmeta b/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png.mcmeta
similarity index 100%
rename from resources/assets/enderio/textures/items/electricalGrindingBall.png.mcmeta
rename to resources/assets/enderio/textures/items/electricalSteelGrindingBall.png.mcmeta
diff --git a/resources/assets/enderio/textures/items/enderCrystalPowder.png b/resources/assets/enderio/textures/items/enderCrystalPowder.png
new file mode 100644
index 00000000..40643c8f
Binary files /dev/null and b/resources/assets/enderio/textures/items/enderCrystalPowder.png differ
diff --git a/resources/assets/enderio/textures/items/energeticGrindingBall.png b/resources/assets/enderio/textures/items/energeticAlloyGrindingBall.png
similarity index 100%
rename from resources/assets/enderio/textures/items/energeticGrindingBall.png
rename to resources/assets/enderio/textures/items/energeticAlloyGrindingBall.png
diff --git a/resources/assets/enderio/textures/items/vibrantGrindingBall.png b/resources/assets/enderio/textures/items/phasedGoldGrindingBall.png
similarity index 100%
rename from resources/assets/enderio/textures/items/vibrantGrindingBall.png
rename to resources/assets/enderio/textures/items/phasedGoldGrindingBall.png
diff --git a/resources/assets/enderio/textures/items/pulsatingGrindingBall.png b/resources/assets/enderio/textures/items/phasedIronGrindingBall.png
similarity index 100%
rename from resources/assets/enderio/textures/items/pulsatingGrindingBall.png
rename to resources/assets/enderio/textures/items/phasedIronGrindingBall.png
diff --git a/resources/assets/enderio/textures/items/precientCrystal.png b/resources/assets/enderio/textures/items/precientCrystal.png
new file mode 100644
index 00000000..e09b68d8
Binary files /dev/null and b/resources/assets/enderio/textures/items/precientCrystal.png differ
diff --git a/resources/assets/enderio/textures/items/precientPowder.png b/resources/assets/enderio/textures/items/precientPowder.png
new file mode 100644
index 00000000..106bec54
Binary files /dev/null and b/resources/assets/enderio/textures/items/precientPowder.png differ
diff --git a/resources/assets/enderio/textures/items/pulsatingPowder.png b/resources/assets/enderio/textures/items/pulsatingPowder.png
new file mode 100644
index 00000000..d3d0d4c6
Binary files /dev/null and b/resources/assets/enderio/textures/items/pulsatingPowder.png differ
diff --git a/resources/assets/enderio/textures/items/redstoneGrindingBall.png b/resources/assets/enderio/textures/items/redstoneAlloyGrindingBall.png
similarity index 100%
rename from resources/assets/enderio/textures/items/redstoneGrindingBall.png
rename to resources/assets/enderio/textures/items/redstoneAlloyGrindingBall.png
diff --git a/resources/assets/enderio/textures/items/vibrantPowder.png b/resources/assets/enderio/textures/items/vibrantPowder.png
new file mode 100644
index 00000000..9e15316b
Binary files /dev/null and b/resources/assets/enderio/textures/items/vibrantPowder.png differ
diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java
index 3d16d119..89b46303 100644
--- a/src/main/java/crazypants/enderio/EnderIO.java
+++ b/src/main/java/crazypants/enderio/EnderIO.java
@@ -92,6 +92,8 @@ import crazypants.enderio.machine.farm.FarmersRegistry;
import crazypants.enderio.machine.generator.combustion.BlockCombustionGenerator;
import crazypants.enderio.machine.generator.stirling.BlockStirlingGenerator;
import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator;
+import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockEnderGenerator;
+import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockFrankenZombieGenerator;
import crazypants.enderio.machine.generator.zombie.PacketNutrientTank;
import crazypants.enderio.machine.hypercube.BlockHyperCube;
import crazypants.enderio.machine.hypercube.HyperCubeRegister;
@@ -134,13 +136,16 @@ import crazypants.enderio.machine.vat.BlockVat;
import crazypants.enderio.machine.vat.VatRecipeManager;
import crazypants.enderio.machine.wireless.BlockWirelessCharger;
import crazypants.enderio.material.Alloy;
-import crazypants.enderio.material.BlockDarkIronBars;
+import crazypants.enderio.material.BlockDarkSteelBars;
+import crazypants.enderio.material.BlockDarkSteelBars.BlockEndSteelBars;
+import crazypants.enderio.material.BlockDarkSteelBars.BlockSoulariumBars;
import crazypants.enderio.material.BlockFusedQuartz;
import crazypants.enderio.material.BlockIngotStorage;
import crazypants.enderio.material.ItemAlloy;
import crazypants.enderio.material.ItemCapacitor;
import crazypants.enderio.material.ItemFrankenSkull;
import crazypants.enderio.material.ItemFusedQuartzFrame;
+import crazypants.enderio.material.ItemGrindingBall;
import crazypants.enderio.material.ItemMachinePart;
import crazypants.enderio.material.ItemMaterial;
import crazypants.enderio.material.ItemPowderIngot;
@@ -189,13 +194,16 @@ public class EnderIO {
// Materials
public static ItemCapacitor itemBasicCapacitor;
public static ItemAlloy itemAlloy;
+ public static ItemAlloy itemGrindingBall;
public static BlockFusedQuartz blockFusedQuartz;
public static ItemFusedQuartzFrame itemFusedQuartzFrame;
public static ItemMachinePart itemMachinePart;
public static ItemPowderIngot itemPowderIngot;
public static ItemMaterial itemMaterial;
public static BlockIngotStorage blockIngotStorage;
- public static BlockDarkIronBars blockDarkIronBars;
+ public static BlockDarkSteelBars blockDarkIronBars;
+ public static BlockSoulariumBars blockSoulariumBars;
+ public static BlockEndSteelBars blockEndSteelBars;
public static ItemEnderFood itemEnderFood;
// Enderface
@@ -241,6 +249,8 @@ public class EnderIO {
public static BlockStirlingGenerator blockStirlingGenerator;
public static BlockCombustionGenerator blockCombustionGenerator;
public static BlockZombieGenerator blockZombieGenerator;
+ public static BlockFrankenZombieGenerator blockFrankenZombieGenerator;
+ public static BlockEnderGenerator blockEnderGenerator;
public static BlockSolarPanel blockSolarPanel;
public static BlockReservoir blockReservoir;
public static BlockAlloySmelter blockAlloySmelter;
@@ -299,19 +309,27 @@ public class EnderIO {
public static Fluid fluidFireWater;
public static BlockFluidEio blockFireWater;
public static ItemBucketEio itemBucketFireWater;
-
- public static Fluid fluidLiquidSunshine;
- public static Fluid fluidCloudSeed;
- public static Fluid fluidCloudSeedConcentrated;
-
- public static BlockFluidEio blockLiquidSunshine;
- public static BlockFluidEio blockCloudSeed;
- public static BlockFluidEio blockCloudSeedConcentrated;
+ public static Fluid fluidLiquidSunshine;
+ public static BlockFluidEio blockLiquidSunshine;
public static ItemBucketEio itemBucketLiquidSunshine;
+
+ public static Fluid fluidCloudSeed;
+ public static BlockFluidEio blockCloudSeed;
public static ItemBucketEio itemBucketCloudSeed;
+
+ public static Fluid fluidCloudSeedConcentrated;
+ public static BlockFluidEio blockCloudSeedConcentrated;
public static ItemBucketEio itemBucketCloudSeedConcentrated;
-
+
+ public static Fluid fluidEnderDistillation;
+ public static BlockFluidEio blockEnderDistillation;
+ public static ItemBucketEio itemBucketEnderDistillation;
+
+ public static Fluid fluidVapourOfLevity;
+ public static BlockFluidEio blockVapourOfLevity;
+ public static ItemBucketEio itemBucketVapourOfLevity;
+
//Open block compatable liquid XP
public static Fluid fluidXpJuice;
public static ItemBucketEio itemBucketXpJuice;
@@ -328,11 +346,11 @@ public class EnderIO {
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
-
+
EnderIOCrashCallable.create();
Config.load(event);
-
+
proxy.loadIcons();
ConduitGeometryUtil.setupBounds((float) Config.conduitScale);
@@ -340,6 +358,8 @@ public class EnderIO {
blockStirlingGenerator = BlockStirlingGenerator.create();
blockCombustionGenerator = BlockCombustionGenerator.create();
blockZombieGenerator = BlockZombieGenerator.create();
+ blockFrankenZombieGenerator = BlockFrankenZombieGenerator.create();
+ blockEnderGenerator = BlockEnderGenerator.create();
blockSolarPanel = BlockSolarPanel.create();
blockCrusher = BlockCrusher.create();
@@ -432,6 +452,7 @@ public class EnderIO {
itemMachinePart = ItemMachinePart.create();
itemMaterial = ItemMaterial.create();
itemAlloy = ItemAlloy.create();
+ itemGrindingBall = ItemGrindingBall.create();
itemPowderIngot = ItemPowderIngot.create();
registerFluids();
@@ -447,8 +468,11 @@ public class EnderIO {
blockIngotStorage = BlockIngotStorage.create();
- blockDarkIronBars = BlockDarkIronBars.create();
-
+ blockDarkIronBars = BlockDarkSteelBars.create();
+ blockSoulariumBars = BlockSoulariumBars.create();
+ blockEndSteelBars = BlockEndSteelBars.create();
+
+
itemEnderFood = ItemEnderFood.create();
DarkSteelItems.createDarkSteelArmorItems();
@@ -467,52 +491,63 @@ public class EnderIO {
}
private void registerFluids() {
- Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION_NAME).setDensity(1500).setViscosity(3000);
+ Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION).setDensity(1500).setViscosity(3000);
FluidRegistry.registerFluid(f);
fluidNutrientDistillation = FluidRegistry.getFluid(f.getName());
- blockNutrientDistillation = BlockFluidEio.create(fluidNutrientDistillation, Material.water);
+ blockNutrientDistillation = BlockFluidEio.NutrientDistillation.create(fluidNutrientDistillation, Material.water);
PacketHandler.INSTANCE.registerMessage(PacketNutrientTank.class, PacketNutrientTank.class, PacketHandler.nextID(), Side.CLIENT);
- f = new Fluid(Fluids.HOOTCH_NAME).setDensity(900).setViscosity(1000);
+ f = new Fluid(Fluids.HOOTCH).setDensity(900).setViscosity(1000);
FluidRegistry.registerFluid(f);
fluidHootch = FluidRegistry.getFluid(f.getName());
- blockHootch = BlockFluidEio.create(fluidHootch, Material.water);
+ blockHootch = BlockFluidEio.Hootch.create(fluidHootch, Material.water);
FluidFuelRegister.instance.addFuel(f, Config.hootchPowerPerCycleRF, Config.hootchPowerTotalBurnTime);
- FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.HOOTCH_NAME + "@"
+ FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.HOOTCH + "@"
+ (Config.hootchPowerPerCycleRF / 10 * Config.hootchPowerTotalBurnTime));
- f = new Fluid(Fluids.ROCKET_FUEL_NAME).setDensity(900).setViscosity(1000);
+ f = new Fluid(Fluids.ROCKET_FUEL).setDensity(900).setViscosity(1000);
FluidRegistry.registerFluid(f);
fluidRocketFuel = FluidRegistry.getFluid(f.getName());
- blockRocketFuel = BlockFluidEio.create(fluidRocketFuel, Material.water);
+ blockRocketFuel = BlockFluidEio.RocketFuel.create(fluidRocketFuel, Material.water);
FluidFuelRegister.instance.addFuel(f, Config.rocketFuelPowerPerCycleRF, Config.rocketFuelPowerTotalBurnTime);
- FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.ROCKET_FUEL_NAME + "@"
+ FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.ROCKET_FUEL + "@"
+ (Config.rocketFuelPowerPerCycleRF / 10 * Config.rocketFuelPowerTotalBurnTime));
- f = new Fluid(Fluids.FIRE_WATER_NAME).setDensity(900).setViscosity(1000).setTemperature(FluidRegistry.LAVA.getTemperature() * 2);
+ f = new Fluid(Fluids.FIRE_WATER).setDensity(900).setViscosity(1000).setTemperature(FluidRegistry.LAVA.getTemperature() * 2);
FluidRegistry.registerFluid(f);
fluidFireWater = FluidRegistry.getFluid(f.getName());
- blockFireWater = BlockFluidEio.create(fluidFireWater, Material.lava);
+ blockFireWater = BlockFluidEio.FireWater.create(fluidFireWater, Material.lava);
FluidFuelRegister.instance.addFuel(f, Config.fireWaterPowerPerCycleRF, Config.fireWaterPowerTotalBurnTime);
- FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.FIRE_WATER_NAME + "@"
+ FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.FIRE_WATER + "@"
+ (Config.fireWaterPowerPerCycleRF / 10 * Config.fireWaterPowerTotalBurnTime));
- f = new Fluid(Fluids.LIQUID_SUNSHINE_NAME).setDensity(200).setViscosity(400);
+ f = new Fluid(Fluids.LIQUID_SUNSHINE).setDensity(200).setViscosity(400);
FluidRegistry.registerFluid(f);
fluidLiquidSunshine = FluidRegistry.getFluid(f.getName());
blockLiquidSunshine = BlockFluidEio.create(fluidLiquidSunshine, Material.water);
- f = new Fluid(Fluids.CLOUD_SEED_NAME).setDensity(500).setViscosity(800);
+ f = new Fluid(Fluids.CLOUD_SEED).setDensity(500).setViscosity(800);
FluidRegistry.registerFluid(f);
fluidCloudSeed = FluidRegistry.getFluid(f.getName());
blockCloudSeed = BlockFluidEio.create(fluidCloudSeed, Material.water);
-
- f = new Fluid(Fluids.CLOUD_SEED_CONCENTRATED_NAME).setDensity(1000).setViscosity(1200);
+
+ f = new Fluid(Fluids.CLOUD_SEED_CONCENTRATED).setDensity(1000).setViscosity(1200);
FluidRegistry.registerFluid(f);
fluidCloudSeedConcentrated = FluidRegistry.getFluid(f.getName());
- blockCloudSeedConcentrated = BlockFluidEio.create(fluidCloudSeedConcentrated, Material.water);
-
+ blockCloudSeedConcentrated = BlockFluidEio.CloudSeedConcentrated.create(fluidCloudSeedConcentrated, Material.water);
+
+ f = new Fluid(Fluids.ENDER_DISTILLATION).setDensity(200).setViscosity(1000).setTemperature(175);
+ FluidRegistry.registerFluid(f);
+ fluidEnderDistillation = FluidRegistry.getFluid(f.getName());
+ blockEnderDistillation = BlockFluidEio.create(fluidEnderDistillation, Material.water);
+
+ f = new Fluid(Fluids.VAPOR_OF_LEVITY).setDensity(-10).setViscosity(100).setTemperature(5).setGaseous(true);
+ FluidRegistry.registerFluid(f);
+ fluidVapourOfLevity = FluidRegistry.getFluid(f.getName());
+ blockVapourOfLevity = BlockFluidEio.VapourOfLevity.create(fluidVapourOfLevity, Material.water);
+ FluidFuelRegister.instance.addCoolant(f, 0.0314f);
+
if (!Loader.isModLoaded("OpenBlocks")) {
Log.info("XP Juice registered by Ender IO.");
fluidXpJuice = new Fluid(Config.xpJuiceName).setLuminosity(10).setDensity(800).setViscosity(1500).setUnlocalizedName("eio.xpjuice");
@@ -529,6 +564,9 @@ public class EnderIO {
itemBucketLiquidSunshine = ItemBucketEio.create(fluidLiquidSunshine);
itemBucketCloudSeed = ItemBucketEio.create(fluidCloudSeed);
itemBucketCloudSeedConcentrated = ItemBucketEio.create(fluidCloudSeedConcentrated);
+ itemBucketEnderDistillation = ItemBucketEio.create(fluidEnderDistillation);
+ itemBucketVapourOfLevity = ItemBucketEio.create(fluidVapourOfLevity);
+
}
@EventHandler
@@ -617,7 +655,7 @@ public class EnderIO {
ItemRecipes.addRecipes();
TeleportRecipes.addRecipes();
EE3Util.registerMiscRecipes();
-
+
proxy.load();
}
@@ -628,7 +666,7 @@ public class EnderIO {
//Regsiter the enchants
Enchantments.getInstance();
-
+
//This must be loaded before parsing the recipes so we get the preferred outputs
OreDictionaryPreferences.loadConfig();
@@ -641,7 +679,7 @@ public class EnderIO {
SoulBinderRecipeManager.getInstance().addDefaultRecipes();
PaintSourceValidator.instance.loadConfig();
- if(fluidXpJuice == null) { //should have been registered by open blocks
+ if(fluidXpJuice == null) { //should have been registered by open blocks
fluidXpJuice = FluidRegistry.getFluid(getXPJuiceName());
if(fluidXpJuice == null) {
Log.error("Liquid XP Juice registration left to open blocks but could not be found.");
@@ -667,7 +705,7 @@ public class EnderIO {
}
addModIntegration();
-
+
//Register villagers
FMLInterModComms.sendMessage("EnderStructures", "addResourcePath", "/assets/enderio/villagers");
FMLInterModComms.sendMessage("EnderStructures", "registerVillageGenerator", "enderioMobDropVillager");
@@ -714,7 +752,7 @@ public class EnderIO {
Log.info("Failed to registered Capacitor Banks as Tinkers Construct Flux Upgrades");
}
}
-
+
ThaumcraftCompat.load();
}
diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java
index 0bfd7e40..e68a09bf 100644
--- a/src/main/java/crazypants/enderio/ModObject.java
+++ b/src/main/java/crazypants/enderio/ModObject.java
@@ -30,17 +30,22 @@ public enum ModObject {
// Materials
itemBasicCapacitor,
itemAlloy,
+ itemGrindingBall,
itemMaterial,
itemMachinePart,
itemPowderIngot,
blockFusedQuartz,
itemFusedQuartzFrame,
blockDarkIronBars,
+ blockSoulariumBars,
+ blockEndSteelBars,
// Machines
blockStirlingGenerator,
blockCombustionGenerator,
blockZombieGenerator,
+ blockFrankenzombieGenerator,
+ blockEnderGenerator,
blockReservoir,
blockAlloySmelter,
blockSolarPanel,
@@ -104,12 +109,12 @@ public enum ModObject {
itemTravelStaff,
itemMagnet,
itemGliderWing,
- blockEndermanSkull,
- itemSoulVessel,
- itemFrankenSkull,
-
+ blockEndermanSkull,
+ itemSoulVessel,
+ itemFrankenSkull,
+
blockEnderRail,
-
+
itemEnderFood;
public final String unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java
index fcd0f6ca..29487dbc 100644
--- a/src/main/java/crazypants/enderio/config/Config.java
+++ b/src/main/java/crazypants/enderio/config/Config.java
@@ -253,6 +253,9 @@ public final class Config {
public static int darkSteelSolarOneCost = 15;
public static int darkSteelSolarTwoGen = 40;
public static int darkSteelSolarTwoCost = 30;
+ public static int darkSteelSolarThreeGen = 160;
+ public static int darkSteelSolarThreeCost = 40;
+
public static boolean darkSteelSolarChargeOthers = true;
public static float darkSteelAnvilDamageChance = 0.024f;
@@ -269,9 +272,16 @@ public final class Config {
public static int maxPhotovoltaicOutputRF = 10;
public static int maxPhotovoltaicAdvancedOutputRF = 40;
+ public static int maxPhotovoltaicVibrantOutputRF = 160;
public static int zombieGeneratorRfPerTick = 80;
- public static int zombieGeneratorTicksPerBucketFuel = 10000;
+ public static int zombieGeneratorTicksPerBucketFuel = 12000;
+
+ public static int frankenzombieGeneratorRfPerTick = 120;
+ public static int frankenzombieGeneratorTicksPerBucketFuel = 12000;
+
+ public static int enderGeneratorRfPerTick = 360;
+ public static int enderGeneratorTicksPerBucketFuel = 96000;
public static int stirlingGeneratorBaseRfPerTick = 20;
public static float stirlingGeneratorEnergyMultiplierT1 = 1f;
@@ -420,6 +430,8 @@ public final class Config {
public static int soulBinderReanimationLevels = 10;
public static int soulBinderEnderCystalRF = 100000;
public static int soulBinderEnderCystalLevels = 10;
+ public static int soulBinderPrecientCystalRF = 100000;
+ public static int soulBinderPrecientCystalLevels = 10;
public static int soulBinderAttractorCystalRF = 100000;
public static int soulBinderAttractorCystalLevels = 10;
public static int soulBinderEnderRailRF = 100000;
@@ -1037,6 +1049,16 @@ public final class Config {
zombieGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "zombieGeneratorTicksPerMbFuel", zombieGeneratorTicksPerBucketFuel,
"The number of ticks one bucket of fuel lasts.").getInt(zombieGeneratorTicksPerBucketFuel);
+ frankenzombieGeneratorRfPerTick = config.get(sectionPower.name, "frankenzombieGeneratorRfPerTick", frankenzombieGeneratorRfPerTick,
+ "The amount of power generated per tick.").getInt(frankenzombieGeneratorRfPerTick);
+ frankenzombieGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "frankenzombieGeneratorTicksPerMbFuel", frankenzombieGeneratorTicksPerBucketFuel,
+ "The number of ticks one bucket of fuel lasts.").getInt(frankenzombieGeneratorTicksPerBucketFuel);
+
+ enderGeneratorRfPerTick = config.get(sectionPower.name, "enderGeneratorRfPerTick", enderGeneratorRfPerTick,
+ "The amount of power generated per tick.").getInt(enderGeneratorRfPerTick);
+ enderGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "enderGeneratorTicksPerMbFuel", enderGeneratorTicksPerBucketFuel,
+ "The number of ticks one bucket of fuel lasts.").getInt(enderGeneratorTicksPerBucketFuel);
+
stirlingGeneratorBaseRfPerTick = config.get(sectionPower.name, "stirlingGeneratorBaseRfPerTick", stirlingGeneratorBaseRfPerTick,
"The amount of power generated per tick.").getInt(stirlingGeneratorBaseRfPerTick);
@@ -1232,6 +1254,8 @@ public final class Config {
"The number of RF required to to re-animated a mob head.").getInt(soulBinderReanimationRF);
soulBinderEnderCystalRF = config.get(sectionSoulBinder.name, "soulBinderEnderCystalRF", soulBinderEnderCystalRF,
"The number of RF required to create an ender crystal.").getInt(soulBinderEnderCystalRF);
+ soulBinderPrecientCystalRF = config.get(sectionSoulBinder.name, "soulBinderPrecientCystalRF", soulBinderPrecientCystalRF,
+ "The number of RF required to create an precient crystal.").getInt(soulBinderPrecientCystalRF);
soulBinderAttractorCystalRF = config.get(sectionSoulBinder.name, "soulBinderAttractorCystalRF", soulBinderAttractorCystalRF,
"The number of RF required to create an attractor crystal.").getInt(soulBinderAttractorCystalRF);
soulBinderEnderRailRF = config.get(sectionSoulBinder.name, "soulBinderEnderRailRF", soulBinderEnderRailRF,
@@ -1241,6 +1265,8 @@ public final class Config {
"The number of levels required to create an attractor crystal.").getInt(soulBinderAttractorCystalLevels);
soulBinderEnderCystalLevels = config.get(sectionSoulBinder.name, "soulBinderEnderCystalLevels", soulBinderEnderCystalLevels,
"The number of levels required to create an ender crystal.").getInt(soulBinderEnderCystalLevels);
+ soulBinderPrecientCystalLevels = config.get(sectionSoulBinder.name, "soulBinderPrecientCystalLevels", soulBinderPrecientCystalLevels,
+ "The number of levels required to create an precient crystal.").getInt(soulBinderPrecientCystalLevels);
soulBinderReanimationLevels = config.get(sectionSoulBinder.name, "soulBinderReanimationLevels", soulBinderReanimationLevels,
"The number of levels required to re-animate a mob head.").getInt(soulBinderReanimationLevels);
soulBinderBrokenSpawnerLevels = config.get(sectionSoulBinder.name, "soulBinderBrokenSpawnerLevels", soulBinderBrokenSpawnerLevels,
diff --git a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java
index 151cead3..c706e568 100644
--- a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java
+++ b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java
@@ -1,28 +1,203 @@
package crazypants.enderio.fluid;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.BlockFluidClassic;
-import net.minecraftforge.fluids.Fluid;
+import java.util.Random;
import org.apache.commons.lang3.StringUtils;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-import crazypants.enderio.EnderIO;
import crazypants.enderio.config.Config;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.BlockFluidClassic;
+import net.minecraftforge.fluids.Fluid;
public class BlockFluidEio extends BlockFluidClassic {
+ public static class FireWater extends BlockFluidEio {
+
+ protected FireWater(Fluid fluid, Material material) {
+ super(fluid, material);
+ }
+
+ @Override
+ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) {
+ if (!world.isRemote){
+ entity.setFire(50);
+ super.onEntityCollidedWithBlock(world, x, y, z, entity);
+ }
+ }
+
+ @Override
+ public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
+ return true;
+ }
+
+ @Override
+ public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) {
+ return true;
+ }
+
+ @Override
+ public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
+ return 60;
+ }
+
+ }
+
+ public static class Hootch extends BlockFluidEio {
+
+ protected Hootch(Fluid fluid, Material material) {
+ super(fluid, material);
+ }
+
+ @Override
+ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) {
+ if (!world.isRemote && entity instanceof EntityLivingBase)
+ ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.confusion.id, 150, 0, true));
+ super.onEntityCollidedWithBlock(world, x, y, z, entity);
+
+ }
+
+ @Override
+ public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
+ return true;
+ }
+
+ @Override
+ public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) {
+ return true;
+ }
+
+ @Override
+ public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
+ return 1;
+ }
+
+ @Override
+ public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
+ return 60;
+ }
+
+ }
+
+ public static class RocketFuel extends BlockFluidEio {
+
+ protected RocketFuel(Fluid fluid, Material material) {
+ super(fluid, material);
+ }
+
+ @Override
+ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) {
+ if (!world.isRemote && entity instanceof EntityLivingBase)
+ ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 150, 3, true));
+
+ super.onEntityCollidedWithBlock(world, x, y, z, entity);
+
+ }
+
+ @Override
+ public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
+ return true;
+ }
+
+ @Override
+ public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) {
+ return true;
+ }
+
+ @Override
+ public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
+ return 1;
+ }
+
+ @Override
+ public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
+ return 60;
+ }
+
+ }
+
+ public static class NutrientDistillation extends BlockFluidEio {
+
+ private static final String EIO_LAST_FOOD_BOOST = "eioLastFoodBoost";
+
+ protected NutrientDistillation(Fluid fluid, Material material) {
+ super(fluid, material);
+ }
+
+ @Override
+ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) {
+ if (!world.isRemote && entity instanceof EntityLivingBase) {
+ long time = entity.worldObj.getTotalWorldTime();
+ EntityPlayerMP player = (EntityPlayerMP) entity;
+ if(time % Config.nutrientFoodBoostDelay == 0 && player.getEntityData().getLong(EIO_LAST_FOOD_BOOST) != time) {
+ player.getFoodStats().addStats(1, 0.1f);
+ player.getEntityData().setLong(EIO_LAST_FOOD_BOOST, time);
+ }
+ super.onEntityCollidedWithBlock(world, x, y, z, entity);
+ }
+
+ }
+
+ }
+
+ public static class CloudSeedConcentrated extends BlockFluidEio {
+
+ protected CloudSeedConcentrated(Fluid fluid, Material material) {
+ super(fluid, material);
+ }
+
+ @Override
+ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) {
+ if (!world.isRemote && entity instanceof EntityLivingBase) {
+ ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.blindness.id, 40, 0, true));
+ }
+ super.onEntityCollidedWithBlock(world, x, y, z, entity);
+
+ }
+
+ }
+
+ public static class VapourOfLevity extends BlockFluidEio {
+
+ private static final int[] COLORS = { 0x0c82d0, 0x90c8ec, 0x5174ed, 0x0d2f65, 0x4accee };
+
+ protected VapourOfLevity(Fluid fluid, Material material, int fogColor) {
+ super(fluid, material);
+ }
+
+ @Override
+ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) {
+ if (entity instanceof EntityPlayer || (!world.isRemote && entity instanceof EntityLivingBase)) {
+ ((EntityLivingBase) entity).motionY += 0.1;
+ }
+ super.onEntityCollidedWithBlock(world, x, y, z, entity);
+
+ }
+
+ @Override
+ public void randomDisplayTick(World world, int x, int y, int z, Random rand) {
+ if (rand.nextFloat() < .5f) {
+ int col = COLORS[rand.nextInt(COLORS.length)];
+ world.spawnParticle("reddust", x, y, z, (col >> 16 & 255) / 255d, (col >> 8 & 255) / 255d, (col & 255) / 255d);
+ }
+ }
+
+ }
+
+
public static BlockFluidEio create(Fluid fluid, Material material) {
BlockFluidEio res = new BlockFluidEio(fluid, material);
res.init();
@@ -76,28 +251,4 @@ public class BlockFluidEio extends BlockFluidClassic {
return super.displaceIfPossible(world, x, y, z);
}
- @Override
- public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity entity) {
- if(entity.worldObj.isRemote) {
- super.onEntityCollidedWithBlock(p_149670_1_, p_149670_2_, p_149670_3_, p_149670_4_, entity);
- return;
- }
-
- if(this == EnderIO.blockFireWater) {
- entity.setFire(50);
- } else if(this == EnderIO.blockRocketFuel && entity instanceof EntityLivingBase) {
- ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 150, 3, true));
- } else if(this == EnderIO.blockNutrientDistillation && entity instanceof EntityPlayerMP) {
- long time = entity.worldObj.getTotalWorldTime();
- EntityPlayerMP player = (EntityPlayerMP) entity;
- if(time % Config.nutrientFoodBoostDelay == 0 && player.getEntityData().getLong("eioLastFoodBoost") != time) {
- player.getFoodStats().addStats(1, 0.1f);
- player.getEntityData().setLong("eioLastFoodBoost", time);
- }
- } else if (this == EnderIO.blockHootch && entity instanceof EntityLivingBase) {
- ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.confusion.id, 150, 0, true));
- }
-
- super.onEntityCollidedWithBlock(p_149670_1_, p_149670_2_, p_149670_3_, p_149670_4_, entity);
- }
}
\ No newline at end of file
diff --git a/src/main/java/crazypants/enderio/fluid/Fluids.java b/src/main/java/crazypants/enderio/fluid/Fluids.java
index ac004331..5917e5e3 100644
--- a/src/main/java/crazypants/enderio/fluid/Fluids.java
+++ b/src/main/java/crazypants/enderio/fluid/Fluids.java
@@ -1,32 +1,29 @@
package crazypants.enderio.fluid;
-import net.minecraftforge.fluids.IFluidTank;
import crazypants.enderio.EnderIO;
+import net.minecraftforge.fluids.IFluidTank;
public class Fluids {
- public static final String NUTRIENT_DISTILLATION_NAME = "nutrient_distillation";
+ public static final String NUTRIENT_DISTILLATION = "nutrient_distillation";
+ public static final String HOOTCH = "hootch";
+ public static final String ROCKET_FUEL = "rocket_fuel";
+ public static final String FIRE_WATER = "fire_water";
+ public static final String LIQUID_SUNSHINE = "liquid_sunshine";
+ public static final String CLOUD_SEED = "cloud_seed";
+ public static final String CLOUD_SEED_CONCENTRATED = "cloud_seed_concentrated";
+ public static final String ENDER_DISTILLATION = "ender_distillation";
+ public static final String VAPOR_OF_LEVITY = "vapor_of_levity";
- public static final String HOOTCH_NAME = "hootch";
-
- public static final String ROCKET_FUEL_NAME = "rocket_fuel";
-
- public static final String FIRE_WATER_NAME = "fire_water";
-
- public static final String LIQUID_SUNSHINE_NAME = "liquid_sunshine";
- public static final String CLOUD_SEED_NAME = "cloud_seed";
- public static final String CLOUD_SEED_CONCENTRATED_NAME = "cloud_seed_concentrated";
-
- public static String toCapactityString(IFluidTank tank) {
- if(tank == null) {
- return "0/0 " + MB();
- }
- return tank.getFluidAmount() + "/" + tank.getCapacity() + " " + MB();
- }
-
- public static String MB() {
- return EnderIO.lang.localize("fluid.millibucket.abr");
- }
+ public static String toCapactityString(IFluidTank tank) {
+ if(tank == null) {
+ return "0/0 " + MB();
+ }
+ return tank.getFluidAmount() + "/" + tank.getCapacity() + " " + MB();
+ }
+ public static String MB() {
+ return EnderIO.lang.localize("fluid.millibucket.abr");
+ }
}
diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java
index 05cbd218..2c822051 100644
--- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java
+++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java
@@ -63,6 +63,7 @@ public class DarkSteelRecipeManager {
upgrades.add(SpoonUpgrade.INSTANCE);
upgrades.add(SolarUpgrade.SOLAR_ONE);
upgrades.add(SolarUpgrade.SOLAR_TWO);
+ upgrades.add(SolarUpgrade.SOLAR_THREE);
if(Loader.isModLoaded("Thaumcraft")) {
ThaumcraftCompat.loadUpgrades(upgrades);
}
diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java
index 2c9c16ad..ff03d2a8 100644
--- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java
+++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java
@@ -30,6 +30,7 @@ public class SolarUpgrade extends AbstractUpgrade {
public static final SolarUpgrade SOLAR_ONE = new SolarUpgrade("enderio.darksteel.upgrade.solar_one", (byte) 1, Config.darkSteelSolarOneCost);
public static final SolarUpgrade SOLAR_TWO = new SolarUpgrade("enderio.darksteel.upgrade.solar_two", (byte) 2, Config.darkSteelSolarTwoCost);
+ public static final SolarUpgrade SOLAR_THREE = new SolarUpgrade("enderio.darksteel.upgrade.solar_three", (byte) 3, Config.darkSteelSolarThreeCost);
private Render render;
@@ -46,12 +47,8 @@ public class SolarUpgrade extends AbstractUpgrade {
return new SolarUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME));
}
- private static ItemStack createUpgradeItem() {
- ItemStack pot = new ItemStack(Items.potionitem, 1, 0);
- int res = PotionHelper.applyIngredient(0, Items.nether_wart.getPotionEffect(new ItemStack(Items.nether_wart)));
- res = PotionHelper.applyIngredient(res, PotionHelper.sugarEffect);
- pot.setItemDamage(res);
- return pot;
+ private static ItemStack createUpgradeItem(int level) {
+ return new ItemStack(EnderIO.blockSolarPanel,1,level-1);
}
private byte level;
@@ -62,7 +59,7 @@ public class SolarUpgrade extends AbstractUpgrade {
}
public SolarUpgrade(String unlocName, byte level, int levelCost) {
- super(UPGRADE_NAME, unlocName, createUpgradeItem(), levelCost);
+ super(UPGRADE_NAME, unlocName, createUpgradeItem(level), levelCost);
this.level = (byte) level;
}
@@ -101,7 +98,10 @@ public class SolarUpgrade extends AbstractUpgrade {
}
public int getRFPerSec() {
- return level == 1 ? Config.darkSteelSolarOneGen : Config.darkSteelSolarTwoGen;
+ if(level==0) return Config.darkSteelSolarOneGen;
+ if(level==1) return Config.darkSteelSolarTwoGen;
+ else return Config.darkSteelSolarThreeGen;
+
}
@Override
@@ -114,8 +114,6 @@ public class SolarUpgrade extends AbstractUpgrade {
private class Render implements IRenderUpgrade {
private EntityItem item = new EntityItem(Minecraft.getMinecraft().theWorld);
- private ItemStack panel1 = new ItemStack(EnderIO.blockSolarPanel, 1, 0);
- private ItemStack panel2 = new ItemStack(EnderIO.blockSolarPanel, 1, 1);
@Override
public void render(RenderPlayerEvent event, ItemStack stack, boolean head) {
@@ -128,7 +126,7 @@ public class SolarUpgrade extends AbstractUpgrade {
GL11.glRotated(180, 1, 0, 0);
GL11.glScalef(2.1f, 2.1f, 2.1f);
byte level = loadFromItem(stack).level;
- item.setEntityItemStack(level == 0 ? panel1 : panel2);
+ item.setEntityItemStack(new ItemStack(EnderIO.blockSolarPanel, 1, level-1));
RenderManager.instance.renderEntityWithPosYaw(item, 0, 0, 0, 0, 0);
}
}
diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java
index 03e9f5b1..24c48b5e 100644
--- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java
+++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java
@@ -42,12 +42,14 @@ public class MachineRecipes {
ItemStack sentientEnder = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SENTIENT_ENDER.ordinal());
ItemStack obsidian = new ItemStack(Blocks.obsidian);
+ String redstoneAlloy = REDSTONE_ALLOY.getOreIngot();
String electricalSteel = ELECTRICAL_STEEL.getOreIngot();
String darkSteel = DARK_STEEL.getOreIngot();
String energeticAlloy = ENERGETIC_ALLOY.getOreIngot();
String phasedGold = PHASED_GOLD.getOreIngot();
String phasedIron = PHASED_IRON.getOreIngot();
String soularium = SOULARIUM.getOreIngot();
+ String endSteel = END_STEEL.getOreIngot();
String vibCry = VIBRANT_CYSTAL.oreDict;
String pulCry = PULSATING_CYSTAL.oreDict;
@@ -73,6 +75,14 @@ public class MachineRecipes {
ItemStack zg = new ItemStack(EnderIO.blockZombieGenerator, 1, 0);
addShaped(zg, "eee", "qzq", "qqq", 'e', electricalSteel, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 0));
+ //FrankenzombieGen
+ ItemStack fg = new ItemStack(EnderIO.blockFrankenZombieGenerator, 1, 0);
+ addShaped(fg, "eee", "qzq", "qqq", 'e', soularium, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 2));
+
+ //EnderGen
+ ItemStack eg = new ItemStack(EnderIO.blockEnderGenerator, 1, 0);
+ addShaped(eg, "eee", "qzq", "qqq", 'e', endSteel, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 3));
+
//KillerJoe
ItemStack kj = new ItemStack(EnderIO.blockKillerJoe, 1, 0);
addShaped(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie);
@@ -97,7 +107,7 @@ public class MachineRecipes {
addShaped(poweredSpawner, "ese", "eme", "vzv", 'e', electricalSteel, 's', "itemSkull", 'v', vibCry, 'm', machineChassi, 'z', zombieBit);
if (Config.reservoirEnabled) {
- //reservoir
+ //reservoir
ItemStack reservoir = new ItemStack(EnderIO.blockReservoir, 2, 0);
Object glassSides;
if (Config.useHardRecipes) {
@@ -185,14 +195,17 @@ public class MachineRecipes {
ItemStack solarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 0);
ItemStack advSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 1);
+ ItemStack vibSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 2);
+
if (Config.useHardRecipes) {
- addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'c', capacitor, 'e', energeticAlloy, 'p',
- phasedGold);
+ addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'c', capacitor, 'e', energeticAlloy, 'p', phasedGold);
addShaped(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'c', capacitor2, 'e', phasedIron, 'p', phasedGold);
+ addShaped(vibSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'c', capacitor3, 'e', endSteel, 'p', phasedGold);
} else {
- addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'p', silicon, 'e', energeticAlloy, 'c',
- electricalSteel);
- addShaped(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', vibCry, 'e', phasedGold, 'c', phasedIron);
+ addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'p', silicon, 'e', energeticAlloy, 'c', redstoneAlloy);
+ addShaped(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', pulCry, 'e', phasedIron, 'c', electricalSteel);
+ addShaped(vibSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', vibCry, 'e', phasedGold, 'c', endSteel);
+
}
}
diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java
index 69b60241..6473cb1f 100644
--- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java
+++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java
@@ -129,7 +129,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
public static final int maxFirtSlot = maxToolSlot + NUM_FERTILIZER_SLOTS;
public static final int NUM_SUPPLY_SLOTS = 4;
-
+
public static final int minSupSlot = maxFirtSlot + 1;
public static final int maxSupSlot = maxFirtSlot + NUM_SUPPLY_SLOTS;
@@ -486,7 +486,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
}
private int bonemealCooldown = 5; // no need to persist this
-
+
private boolean hasBonemeal() {
if (inventory[minFirtSlot] != null) {
return true;
@@ -519,7 +519,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
/*
* Returns a fuzzy boolean:
- *
+ *
* <=0 - break no leaves for saplings
* 50 - break half the leaves for saplings
* 90 - break 90% of the leaves for saplings
@@ -527,7 +527,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
public int isLowOnSaplings(BlockCoord bc) {
int slot = getSupplySlotForCoord(bc);
ItemStack inv = inventory[slot];
-
+
return 90 * (Config.farmSaplingReserveAmount - (inv == null ? 0 : inv.stackSize)) / Config.farmSaplingReserveAmount;
}
@@ -614,7 +614,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
for (int j = minSupSlot; j < slot; j++) {
slots[k++] = j;
}
-
+
int origSize = stack.stackSize;
stack = stack.copy();
@@ -717,6 +717,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
case ENDER_CAPACITOR:
setCapacitor(new BasicCapacitor(ppt * 40, 1000000, ppt));
break;
+ default:
+ break;
}
currentTask = createTask();
}
@@ -781,6 +783,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
return 32;
case ENDER_CAPACITOR:
return 64;
+ default:
+ break;
}
}
return 64;
diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java
index e4987add..2f296ae3 100644
--- a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java
+++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java
@@ -18,9 +18,48 @@ import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import crazypants.enderio.config.Config;
import crazypants.enderio.machine.AbstractMachineBlock;
+import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileFrankenZombieGenerator;
+import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileEnderGenerator;
+
public class BlockZombieGenerator extends AbstractMachineBlock {
+ public static class BlockFrankenZombieGenerator extends BlockZombieGenerator {
+
+ public BlockFrankenZombieGenerator() {
+ super(ModObject.blockFrankenzombieGenerator, TileFrankenZombieGenerator.class);
+ }
+
+ public static BlockFrankenZombieGenerator create() {
+ BlockFrankenZombieGenerator gen = new BlockFrankenZombieGenerator();
+ gen.init();
+ return gen;
+ }
+
+ public GeneratorType getGeneratorType(){
+ return GeneratorType.FRANKENZOMBIE;
+ }
+
+ }
+
+ public static class BlockEnderGenerator extends BlockZombieGenerator {
+
+ public BlockEnderGenerator() {
+ super(ModObject.blockEnderGenerator, TileEnderGenerator.class);
+ }
+
+ public static BlockEnderGenerator create() {
+ BlockEnderGenerator gen = new BlockEnderGenerator();
+ gen.init();
+ return gen;
+ }
+
+ public GeneratorType getGeneratorType(){
+ return GeneratorType.ENDER;
+ }
+
+ }
+
public static BlockZombieGenerator create() {
BlockZombieGenerator gen = new BlockZombieGenerator();
gen.init();
@@ -28,7 +67,11 @@ public class BlockZombieGenerator extends AbstractMachineBlock clazz) {
+ super(obj, (Class) clazz, Material.anvil);
}
@Override
@@ -117,4 +160,8 @@ public class BlockZombieGenerator extends AbstractMachineBlock= (getMaxEnergyStored() - (outputPerTick * 200)) && getEnergyStored() > (getMaxEnergyStored() / 8)) {
+ if (inPause && getEnergyStored() >= (getMaxEnergyStored() - (getOutputPerTick() * 200)) && getEnergyStored() > (getMaxEnergyStored() / 8)) {
return false;
}
inPause = false;
- if(fuelTank.getFluidAmount() < getActivationAmount()) {
+ if(fuelTank.getFluidAmount() < getActivationAmount()) {
return false;
}
-
-
- ticksRemaingFuel--;
+
+
+ ticksRemaingFuel--;
if(ticksRemaingFuel <= 0) {
fuelTank.drain(1, true);
- ticksRemaingFuel = tickPerBucketOfFuel/1000;
+ ticksRemaingFuel = tickPerBucketOfFuel/1000;
tanksDirty = true;
- }
- setEnergyStored(getEnergyStored() + outputPerTick);
+ }
+ setEnergyStored(getEnergyStored() + getOutputPerTick());
return true;
}
-
+
int getActivationAmount() {
- return (int) (fuelTank.getCapacity() * 0.7f);
+ return minimumTankLevel;
}
private boolean transmitEnergy() {
@@ -177,8 +214,8 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu
if(powerDis == null) {
powerDis = new PowerDistributor(new BlockCoord(this));
}
- int transmitted = powerDis.transmitEnergy(worldObj, Math.min(outputPerTick * 2, getEnergyStored()));
- setEnergyStored(getEnergyStored() - transmitted);
+ int transmitted = powerDis.transmitEnergy(worldObj, Math.min(getOutputPerTick() * 2, getEnergyStored()));
+ setEnergyStored(getEnergyStored() - transmitted);
return transmitted > 0;
}
@@ -219,7 +256,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu
public int getFluidStored(ForgeDirection from) {
return fuelTank.getFluidAmount();
}
-
+
@Override
public void readCustomNBT(NBTTagCompound nbtRoot) {
super.readCustomNBT(nbtRoot);
@@ -257,7 +294,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu
@Override
public FluidTank getInputTank(FluidStack forFluidType) {
- if (forFluidType != null && forFluidType.getFluid() == EnderIO.fluidNutrientDistillation) {
+ if (forFluidType != null && forFluidType.getFluid() == getFluidType()) {
return fuelTank;
}
return null;
@@ -278,4 +315,22 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu
return fuelTank;
}
+ protected Fluid getFluidType() {
+ return EnderIO.fluidNutrientDistillation;
+ }
+
+ public int getTicksPerBucketOfFuel() {
+ return tickPerBucketOfFuel;
+ }
+
+ public GeneratorType getGeneratorType(){
+ return ((BlockZombieGenerator) worldObj.getBlock(xCoord, yCoord, zCoord)).getGeneratorType();
+ }
+
+ public int getOutputPerTick(){
+ if(inventory[slotDefinition.getMaxUpgradeSlot()] != null)
+ return baseOutputPerTick*(4+inventory[slotDefinition.getMaxUpgradeSlot()].getItemDamage())/4;
+ else return baseOutputPerTick;
+ }
+
}
diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java
index 7f3d807a..11c463e9 100644
--- a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java
+++ b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java
@@ -1,18 +1,5 @@
package crazypants.enderio.machine.generator.zombie;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import net.minecraftforge.client.IItemRenderer;
-import net.minecraftforge.client.MinecraftForgeClient;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidTank;
-
import org.lwjgl.opengl.GL11;
import com.enderio.core.client.render.BoundingBox;
@@ -23,13 +10,27 @@ import com.enderio.core.common.vecmath.Vector3d;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockFrankenZombieGenerator;
+import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockEnderGenerator;
+import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileEnderGenerator;
+import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileFrankenZombieGenerator;
import crazypants.util.RenderPassHelper;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.client.IItemRenderer;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidTank;
@SideOnly(Side.CLIENT)
public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implements IItemRenderer {
- private static final String TEXTURE = "enderio:models/ZombieJar.png";
-
private ModelZombieJar model = new ModelZombieJar();
@Override
@@ -48,7 +49,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement
GL11.glPushMatrix();
GL11.glTranslatef((float) x, (float) y, (float) z);
if (RenderPassHelper.getEntityRenderPass() == 0) {
- renderModel(gen.facing);
+ renderModel(gen.getGeneratorType(), gen.facing);
} else if (RenderPassHelper.getEntityRenderPass() == 1) {
renderFluid(gen);
}
@@ -106,7 +107,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement
}
}
- private void renderModel(int facing) {
+ private void renderModel(GeneratorType gen, int facing) {
GL11.glPushMatrix();
@@ -123,7 +124,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement
}
GL11.glRotatef(facing * -90F, 0F, 1F, 0F);
- RenderUtil.bindTexture(TEXTURE);
+ RenderUtil.bindTexture(gen.getTexture());
model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
GL11.glTranslatef(-0.5F, 0, -0.5F);
@@ -143,15 +144,16 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
- renderItem(0, 0, 0);
+ renderItem(((BlockZombieGenerator) Block.getBlockFromItem(item.getItem())).getGeneratorType(),0,0,0);
+
}
- private void renderItem(float x, float y, float z) {
+ private void renderItem(GeneratorType gen, float x, float y, float z) {
GL11.glPushMatrix();
GL11.glTranslatef(x, y, z);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
- renderModel(ForgeDirection.SOUTH.ordinal());
+ renderModel(gen,ForgeDirection.SOUTH.ordinal());
GL11.glDisable(GL11.GL_BLEND);
GL11.glPopMatrix();
}
diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java
index 3c64fcfb..4d6323eb 100644
--- a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java
+++ b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java
@@ -38,9 +38,9 @@ public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvan
public String getUnlocalizedName(ItemStack par1ItemStack) {
int meta = par1ItemStack.getItemDamage();
String result = super.getUnlocalizedName(par1ItemStack);
- if(meta == 1) {
- result += ".advanced";
- }
+ if(meta == 1) result += ".advanced";
+ if(meta == 2) result += ".vibrant";
+
return result;
}
@@ -52,6 +52,8 @@ public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvan
par3List.add(stack);
stack = new ItemStack(this, 1,1);
par3List.add(stack);
+ stack = new ItemStack(this, 1,2);
+ par3List.add(stack);
}
@SuppressWarnings("rawtypes")
@@ -70,9 +72,11 @@ public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvan
public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack);
int prod = Config.maxPhotovoltaicOutputRF;
- if(itemstack.getItemDamage() == 1) {
+ if(itemstack.getItemDamage() == 1)
prod = Config.maxPhotovoltaicAdvancedOutputRF;
- }
+ if(itemstack.getItemDamage() == 2)
+ prod = Config.maxPhotovoltaicVibrantOutputRF;
+
list.add(EnderIO.lang.localize("maxSolorProduction") + " " + PowerDisplayUtil.formatPowerPerTick(prod));
}
diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java
index b90242ad..601396ac 100644
--- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java
+++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java
@@ -45,6 +45,10 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide
IIcon borderIcon;
IIcon advancedBorderIcon;
+ IIcon vibrantIcon;
+ IIcon vibrantSideIcon;
+ IIcon vibrantBorderIcon;
+
private BlockSolarPanel() {
super(ModObject.blockSolarPanel.unlocalisedName, TileEntitySolarPanel.class);
if(!Config.photovoltaicCellEnabled) {
@@ -80,13 +84,28 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int meta) {
if(side == ForgeDirection.UP.ordinal()) {
- return meta == 0 ? blockIcon : advancedIcon;
+ switch(meta){
+ case 0:return blockIcon;
+ case 1:return advancedIcon;
+ case 2:return vibrantIcon;
+ default: return blockIcon;
+ }
}
- return meta == 0 ? sideIcon : advancedSideIcon;
+ switch(meta){
+ case 0:return sideIcon;
+ case 1:return advancedSideIcon;
+ case 2:return vibrantSideIcon;
+ default: return sideIcon;
+ }
}
public IIcon getBorderIcon(int i, int meta) {
- return meta == 0 ? borderIcon : advancedBorderIcon;
+ switch(meta){
+ case 0:return borderIcon;
+ case 1:return advancedBorderIcon;
+ case 2:return vibrantBorderIcon;
+ default: return borderIcon;
+ }
}
@Override
@@ -107,10 +126,14 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide
public void registerBlockIcons(IIconRegister register) {
blockIcon = register.registerIcon("enderio:solarPanelTop");
advancedIcon = register.registerIcon("enderio:solarPanelAdvancedTop");
+ vibrantIcon = register.registerIcon("enderio:solarPanelVibrantTop");
sideIcon = register.registerIcon("enderio:solarPanelSide");
advancedSideIcon = register.registerIcon("enderio:solarPanelAdvancedSide");
+ vibrantSideIcon = register.registerIcon("enderio:solarPanelVibrantSide");
borderIcon = register.registerIcon("enderio:solarPanelBorder");
advancedBorderIcon = register.registerIcon("enderio:solarPanelAdvancedBorder");
+ vibrantBorderIcon = register.registerIcon("enderio:solarPanelVibrantBorder");
+
}
@Override
diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java
index d96952f1..842cc7e2 100644
--- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java
+++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java
@@ -25,24 +25,24 @@ import crazypants.enderio.power.PowerHandlerUtil;
import crazypants.enderio.waila.IWailaNBTProvider;
public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowerProvider, IWailaNBTProvider {
-
+
private final List receptors = new ArrayList();
private ListIterator receptorIterator = receptors.listIterator();
private boolean receptorsDirty = true;
private int lastCollectionValue = -1;
-
+
private static final int CHECK_INTERVAL = 100;
-
+
EnergyStorage destroyedNetworkBuffer = null;
-
+
protected SolarPanelNetwork network = new SolarPanelNetwork();
public void onNeighborBlockChange() {
receptorsDirty = true;
}
-
+
// RF Power
@@ -65,7 +65,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe
public int getMaxEnergyStored(ForgeDirection from) {
return getMaxEnergyStored();
}
-
+
@Override
public int getMaxEnergyRecieved(ForgeDirection dir) {
return 0;
@@ -93,7 +93,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe
}
collectEnergy();
transmitEnergy();
-
+
if (network.isValid()) {
if (destroyedNetworkBuffer != null) {
network.addBuffer(destroyedNetworkBuffer);
@@ -101,12 +101,12 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe
}
network.onUpdate(this);
}
-
+
if (!network.isValid() || (shouldDoWorkThisTick(20, 1) && network.addToNetwork(this))) {
findNetwork();
}
}
-
+
@Override
public void invalidate() {
network.removeFromNetwork(this);
@@ -147,16 +147,17 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe
private int getEnergyPerTick() {
int meta = getBlockMetadata();
- if(meta == 0) {
+ if(meta == 0)
return Config.maxPhotovoltaicOutputRF;
- }
- return Config.maxPhotovoltaicAdvancedOutputRF;
+ if(meta == 1)
+ return Config.maxPhotovoltaicAdvancedOutputRF;
+ return Config.maxPhotovoltaicVibrantOutputRF;
}
float calculateLightRatio() {
return calculateLightRatio(worldObj, xCoord, yCoord, zCoord);
}
-
+
boolean canSeeSun() {
return worldObj.canBlockSeeTheSky(xCoord, yCoord, zCoord);
}
@@ -211,7 +212,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe
appliedCount++;
}
- setEnergyStored(getEnergyStored() - transmitted);
+ setEnergyStored(getEnergyStored() - transmitted);
return transmitted > 0;
@@ -269,7 +270,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe
public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
readFromNBT(pkt.func_148857_g());
}
-
+
@Override
public boolean displayPower() {
return true;
@@ -278,7 +279,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe
public void setNetwork(SolarPanelNetwork network) {
this.network = network;
}
-
+
public boolean isMaster() {
return network.getMaster() == this;
}
diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java
new file mode 100644
index 00000000..4a0f6d88
--- /dev/null
+++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java
@@ -0,0 +1,26 @@
+package crazypants.enderio.machine.soul;
+
+import net.minecraft.item.ItemStack;
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.config.Config;
+import crazypants.enderio.material.Material;
+
+public class SoulBinderPrecientCystalRecipe extends AbstractSoulBinderRecipe {
+
+ public static SoulBinderPrecientCystalRecipe instance = new SoulBinderPrecientCystalRecipe();
+
+ private SoulBinderPrecientCystalRecipe() {
+ super(Config.soulBinderPrecientCystalRF, Config.soulBinderPrecientCystalLevels, "SoulBinderPrecientCystalRecipe", "SpecialMobs.SpecialEnderman", "Enderman");
+ }
+
+ @Override
+ public ItemStack getInputStack() {
+ return new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal());
+ }
+
+ @Override
+ public ItemStack getOutputStack() {
+ return new ItemStack(EnderIO.itemMaterial, 1, Material.PRECIENT_CRYSTAL.ordinal());
+ }
+
+}
diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java
index ebbf9cb6..08238927 100644
--- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java
+++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java
@@ -30,6 +30,7 @@ public class SoulBinderRecipeManager {
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderSentientRecipe.instance);
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderEnderCystalRecipe.instance);
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderAttractorCystalRecipe.instance);
+ MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderPrecientCystalRecipe.instance);
//Ender Rail
if(Config.transceiverEnabled && Config.enderRailEnabled) {
@@ -40,7 +41,7 @@ public class SoulBinderRecipeManager {
}
// Example of how to add a recipe:
- //
+ //
// NBTTagCompound root = new NBTTagCompound();
// root.setString(SoulBinderRecipeManager.KEY_RECIPE_UID, "diamondToWood");
// root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_ENERGY, 50000);
@@ -54,14 +55,14 @@ public class SoulBinderRecipeManager {
// stackRoot = new NBTTagCompound();
// is.writeToNBT(stackRoot);
// root.setTag(SoulBinderRecipeManager.KEY_OUTPUT_STACK, stackRoot);
- //
+ //
// SoulBinderRecipeManager.getInstance().addRecipeFromNBT(root);
// FMLInterModComms.sendMessage("EnderIO", "recipe:soulbinder", root);
//@formatter:off
/**
* Example of how to add a recipe:
- *
+ *
* NBTTagCompound root = new NBTTagCompound();
* root.setString(SoulBinderRecipeManager.KEY_RECIPE_UID, "diamondToWood");
* root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_ENERGY, 50000);
@@ -75,10 +76,10 @@ public class SoulBinderRecipeManager {
* stackRoot = new NBTTagCompound();
* is.writeToNBT(stackRoot);
* root.setTag(SoulBinderRecipeManager.KEY_OUTPUT_STACK, stackRoot);
- *
+ *
* SoulBinderRecipeManager.getInstance().addRecipeFromNBT(root);
* FMLInterModComms.sendMessage("EnderIO", "recipe:soulbinder", root);
- *
+ *
* @param root
* @return
*/
diff --git a/src/main/java/crazypants/enderio/material/Alloy.java b/src/main/java/crazypants/enderio/material/Alloy.java
index 24a041a5..df5c5064 100644
--- a/src/main/java/crazypants/enderio/material/Alloy.java
+++ b/src/main/java/crazypants/enderio/material/Alloy.java
@@ -56,6 +56,10 @@ public enum Alloy {
return new ItemStack(EnderIO.itemAlloy, size, ordinal());
}
+ public ItemStack getStackBall(int size) {
+ return new ItemStack(EnderIO.itemGrindingBall, size, ordinal());
+ }
+
public ItemStack getStackBlock() {
return getStackBlock(1);
}
@@ -79,4 +83,5 @@ public enum Alloy {
public List getOreBlocks() {
return oreBlocks;
}
+
}
diff --git a/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java b/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java
deleted file mode 100644
index 2476fff4..00000000
--- a/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package crazypants.enderio.material;
-
-import net.minecraft.block.BlockPane;
-import net.minecraft.block.material.Material;
-import net.minecraftforge.oredict.OreDictionary;
-import cpw.mods.fml.common.registry.GameRegistry;
-import crazypants.enderio.EnderIOTab;
-import crazypants.enderio.ModObject;
-
-public class BlockDarkIronBars extends BlockPane {
-
- public static BlockDarkIronBars create() {
- BlockDarkIronBars res = new BlockDarkIronBars();
- res.init();
- return res;
- }
-
- public BlockDarkIronBars() {
- super("enderio:blockDarkIronBars", "enderio:blockDarkIronBars", Material.iron, true);
- setResistance(2000.0F); //TNT Proof
- setHardness(5.0F);
- setStepSound(soundTypeMetal);
- setBlockName(ModObject.blockDarkIronBars.unlocalisedName);
- setCreativeTab(EnderIOTab.tabEnderIO);
- }
-
- protected void init() {
- GameRegistry.registerBlock(this, BlockItemDarkIronBars.class, ModObject.blockDarkIronBars.unlocalisedName);
- OreDictionary.registerOre("barsIron", this);
- }
-
-}
diff --git a/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java b/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java
new file mode 100644
index 00000000..819b53b1
--- /dev/null
+++ b/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java
@@ -0,0 +1,69 @@
+package crazypants.enderio.material;
+
+import net.minecraft.block.BlockPane;
+import net.minecraft.block.material.Material;
+import net.minecraftforge.oredict.OreDictionary;
+import cpw.mods.fml.common.registry.GameRegistry;
+import crazypants.enderio.EnderIOTab;
+import crazypants.enderio.ModObject;
+
+public class BlockDarkSteelBars extends BlockPane {
+
+ public static class BlockSoulariumBars extends BlockDarkSteelBars {
+
+ public BlockSoulariumBars() {
+ super(ModObject.blockSoulariumBars, "blockSoulariumBars");
+ setBlockName(ModObject.blockSoulariumBars.unlocalisedName);
+ }
+
+ public static BlockSoulariumBars create() {
+ BlockSoulariumBars res = new BlockSoulariumBars();
+ res.init();
+ return res;
+ }
+
+ }
+
+ public static class BlockEndSteelBars extends BlockDarkSteelBars {
+
+ public BlockEndSteelBars() {
+ super(ModObject.blockEndSteelBars, "blockEndSteelBars");
+ setBlockName(ModObject.blockEndSteelBars.unlocalisedName);
+ }
+
+ public static BlockEndSteelBars create() {
+ BlockEndSteelBars res = new BlockEndSteelBars();
+ res.init();
+ return res;
+ }
+
+ }
+
+ public static BlockDarkSteelBars create() {
+ BlockDarkSteelBars res = new BlockDarkSteelBars();
+ res.init();
+ return res;
+ }
+
+ ModObject modObj;
+
+ public BlockDarkSteelBars(ModObject obj, String name) {
+ super("enderio:"+name, "enderio:"+name, Material.iron, true);
+ this.modObj = obj;
+ setResistance(2000.0F); //TNT Proof
+ setHardness(5.0F);
+ setStepSound(soundTypeMetal);
+ setBlockName(obj.unlocalisedName);
+ setCreativeTab(EnderIOTab.tabEnderIO);
+ }
+
+ public BlockDarkSteelBars() {
+ this(ModObject.blockDarkIronBars,"blockDarkIronBars");
+ }
+
+ protected void init() {
+ GameRegistry.registerBlock(this, BlockItemDarkIronBars.class, modObj.unlocalisedName);
+ OreDictionary.registerOre("barsIron", this);
+ }
+
+}
diff --git a/src/main/java/crazypants/enderio/material/ItemAlloy.java b/src/main/java/crazypants/enderio/material/ItemAlloy.java
index fc380639..665f5bdc 100644
--- a/src/main/java/crazypants/enderio/material/ItemAlloy.java
+++ b/src/main/java/crazypants/enderio/material/ItemAlloy.java
@@ -18,8 +18,8 @@ public class ItemAlloy extends Item {
static final boolean useNuggets = false;
- private final IIcon[] icons;
- private final int numItems;
+ protected final IIcon[] icons;
+ protected final int numItems;
public static ItemAlloy create() {
ItemAlloy alloy = new ItemAlloy();
@@ -27,7 +27,7 @@ public class ItemAlloy extends Item {
return alloy;
}
- private ItemAlloy() {
+ protected ItemAlloy() {
setHasSubtypes(true);
setMaxDamage(0);
setCreativeTab(EnderIOTab.tabEnderIO);
diff --git a/src/main/java/crazypants/enderio/material/ItemGrindingBall.java b/src/main/java/crazypants/enderio/material/ItemGrindingBall.java
new file mode 100644
index 00000000..98289f01
--- /dev/null
+++ b/src/main/java/crazypants/enderio/material/ItemGrindingBall.java
@@ -0,0 +1,50 @@
+package crazypants.enderio.material;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.ModObject;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
+
+public class ItemGrindingBall extends ItemAlloy {
+
+ public static ItemGrindingBall create() {
+ ItemGrindingBall ball = new ItemGrindingBall();
+ ball.init();
+ return ball;
+ }
+
+ private ItemGrindingBall() {
+ setUnlocalizedName(ModObject.itemGrindingBall.unlocalisedName);
+ }
+
+ private void init() {
+ GameRegistry.registerItem(this, ModObject.itemGrindingBall.unlocalisedName);
+
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public IIcon getIconFromDamage(int damage) {
+ damage = MathHelper.clamp_int(damage, 0, numItems - 1);
+ return icons[damage];
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void registerIcons(IIconRegister IIconRegister) {
+ int numAlloys = Alloy.values().length;
+ for (int i = 0; i < numAlloys; i++)
+ icons[i] = IIconRegister.registerIcon(Alloy.values()[i].iconKey+"GrindingBall");
+
+ }
+
+ @Override
+ public String getUnlocalizedName(ItemStack par1ItemStack) {
+ int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1);
+ return Alloy.values()[i].unlocalisedName+"_ball";
+ }
+}
diff --git a/src/main/java/crazypants/enderio/material/Material.java b/src/main/java/crazypants/enderio/material/Material.java
index c20831a7..5baf4493 100644
--- a/src/main/java/crazypants/enderio/material/Material.java
+++ b/src/main/java/crazypants/enderio/material/Material.java
@@ -22,15 +22,13 @@ public enum Material {
ATTRACTOR_CRYSTAL("attractorCrystal", true),
WEATHER_CRYSTAL("weatherCrystal", true),
END_STEEL_NUGGET("endSteelNugget"),
- ELECTRICAL_GRINDING_BALL("electricalGrindingBall"),
- ENERGETIC_GRINDING_BALL("energeticGrindingBall"),
- VIBRANT_GRINDING_BALL("vibrantGrindingBall"),
- REDSTONE_GRINDING_BALL("redstoneGrindingBall"),
- CONDUCTIVE_GRINDING_BALL("conductiveGrindingBall"),
- PULSATING_GRINDING_BALL("pulsatingGrindingBall"),
- SOULARIUM_GRINDING_BALL("soulariumGrindingBall"),
- END_STEEL_GRINDING_BALL("endSteelGrindingBall"),
- DARK_STEEL_ROD("darkSteelRod");
+ DARK_STEEL_ROD("darkSteelRod"),
+ PRECIENT_CRYSTAL("precientCrystal",true),
+ PULSATING_POWDER("pulsatingPowder", true),
+ VIBRANT_POWDER("vibrantPowder", true),
+ ENDER_POWDER("enderCrystalPowder", true),
+ PRECIENT_POWDER("precientPowder",true);
+
diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java
index 1e78e5b7..88d1cff6 100644
--- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java
+++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java
@@ -106,6 +106,7 @@ public class MaterialRecipes {
String phasedGold = PHASED_GOLD.getOreIngot();
String phasedIron = PHASED_IRON.getOreIngot();
String darkSteel = DARK_STEEL.getOreIngot();
+ String soularium = SOULARIUM.getOreIngot();
String endSteel = END_STEEL.getOreIngot();
ItemStack capacitor = new ItemStack(itemBasicCapacitor, 1, 0);
@@ -145,26 +146,6 @@ public class MaterialRecipes {
ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal());
addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald");
- //Balls
- ItemStack darkBall = new ItemStack(EnderIO.itemMaterial, 5, Material.DARK_GRINDING_BALL.ordinal());
- addShaped(darkBall, " s ", "sss", " s ", 's', darkSteel);
- ItemStack electricalBall = new ItemStack(EnderIO.itemMaterial, 5, Material.ELECTRICAL_GRINDING_BALL.ordinal());
- addShaped(electricalBall, " s ", "sss", " s ", 's', ELECTRICAL_STEEL.getStackIngot());
- ItemStack energeticBall = new ItemStack(EnderIO.itemMaterial, 5, Material.ENERGETIC_GRINDING_BALL.ordinal());
- addShaped(energeticBall, " s ", "sss", " s ", 's', ENERGETIC_ALLOY.getStackIngot());
- ItemStack vibrantBall = new ItemStack(EnderIO.itemMaterial, 5, Material.VIBRANT_GRINDING_BALL.ordinal());
- addShaped(vibrantBall, " s ", "sss", " s ", 's', PHASED_GOLD.getStackIngot());
- ItemStack redstoneBall = new ItemStack(EnderIO.itemMaterial, 5, Material.REDSTONE_GRINDING_BALL.ordinal());
- addShaped(redstoneBall, " s ", "sss", " s ", 's', REDSTONE_ALLOY.getStackIngot());
- ItemStack conductiveBall = new ItemStack(EnderIO.itemMaterial, 5, Material.CONDUCTIVE_GRINDING_BALL.ordinal());
- addShaped(conductiveBall, " s ", "sss", " s ", 's', CONDUCTIVE_IRON.getStackIngot());
- ItemStack pulsatingBall = new ItemStack(EnderIO.itemMaterial, 5, Material.PULSATING_GRINDING_BALL.ordinal());
- addShaped(pulsatingBall, " s ", "sss", " s ", 's', PHASED_IRON.getStackIngot());
- ItemStack soulariumBall = new ItemStack(EnderIO.itemMaterial, 5, Material.SOULARIUM_GRINDING_BALL.ordinal());
- addShaped(soulariumBall, " s ", "sss", " s ", 's', SOULARIUM.getStackIngot());
- ItemStack endBall = new ItemStack(EnderIO.itemMaterial, 5, Material.END_STEEL_GRINDING_BALL.ordinal());
- addShaped(endBall, " s ", "sss", " s ", 's', END_STEEL.getStackIngot());
-
//Smelting
ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal());
ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal());
@@ -182,6 +163,14 @@ public class MaterialRecipes {
ItemStack diBars = new ItemStack(EnderIO.blockDarkIronBars, 16, 0);
addShaped(diBars, "ddd", "ddd", 'd', darkSteel);
+ //Dark Iron Bars
+ ItemStack soBars = new ItemStack(EnderIO.blockSoulariumBars, 16, 0);
+ addShaped(soBars, "ddd", "ddd", 'd', soularium);
+
+ //Dark Iron Bars
+ ItemStack esBars = new ItemStack(EnderIO.blockEndSteelBars, 16, 0);
+ addShaped(esBars, "ddd", "ddd", 'd', endSteel);
+
// Fused Quartz Frame
addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood");
addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick");
@@ -195,10 +184,10 @@ public class MaterialRecipes {
addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor);
ItemStack soulchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.SOUL_MACHINE_CHASSIS.ordinal());
- addShaped(soulchassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', Alloy.SOULARIUM.getOreIngot(), 'c', capacitor);
+ addShaped(soulchassis, "fif", "ici", "fif", 'f', EnderIO.blockSoulariumBars, 'i', Alloy.SOULARIUM.getOreIngot(), 'c', capacitor);
ItemStack endchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.END_STEEL_MACHINE_CHASSIS.ordinal());
- addShaped(endchassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', Alloy.END_STEEL.getOreIngot(), 'c', capacitor);
+ addShaped(endchassis, "fif", "ici", "fif", 'f', EnderIO.blockEndSteelBars, 'i', Alloy.END_STEEL.getOreIngot(), 'c', capacitor);
// Basic Gear
@@ -242,6 +231,7 @@ public class MaterialRecipes {
for (Alloy alloy : Alloy.values()) {
addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot());
+ addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot());
addShapeless(alloy.getStackIngot(9), alloy.getOreBlock());
}