diff --git a/resources/assets/enderio/config/VatRecipes_Core.xml b/resources/assets/enderio/config/VatRecipes_Core.xml index 6013e9c3..31fe07bf 100644 --- a/resources/assets/enderio/config/VatRecipes_Core.xml +++ b/resources/assets/enderio/config/VatRecipes_Core.xml @@ -2,7 +2,7 @@ - + @@ -25,6 +25,22 @@ + + + + + + + + + + + + + + + + diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index c7640235..6fbd2a52 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -43,6 +43,7 @@ enderio.phasedIronNugget.name=Pulsating Iron Nugget //Liquids item.bucketNutrientdistillation.name=Nutrient Distillation Bucket +item.bucketHootch.name=Hootch Bucket //Crafting components enderio.itemMachinePart.name=Machine Parts diff --git a/resources/assets/enderio/textures/blocks/hootch_flow.png b/resources/assets/enderio/textures/blocks/hootch_flow.png new file mode 100644 index 00000000..7053d034 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/hootch_flow.png differ diff --git a/resources/assets/enderio/textures/blocks/hootch_flow.png.mcmeta b/resources/assets/enderio/textures/blocks/hootch_flow.png.mcmeta new file mode 100644 index 00000000..1e64ff03 --- /dev/null +++ b/resources/assets/enderio/textures/blocks/hootch_flow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/blocks/hootch_still.png b/resources/assets/enderio/textures/blocks/hootch_still.png new file mode 100644 index 00000000..5071c64e Binary files /dev/null and b/resources/assets/enderio/textures/blocks/hootch_still.png differ diff --git a/resources/assets/enderio/textures/blocks/hootch_still.png.mcmeta b/resources/assets/enderio/textures/blocks/hootch_still.png.mcmeta new file mode 100644 index 00000000..0645f48c --- /dev/null +++ b/resources/assets/enderio/textures/blocks/hootch_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/assets/enderio/textures/blocks/nutrientdistillation_flow.png b/resources/assets/enderio/textures/blocks/nutrientdistillation_flow.png index ad5f11b8..384f86a7 100644 Binary files a/resources/assets/enderio/textures/blocks/nutrientdistillation_flow.png and b/resources/assets/enderio/textures/blocks/nutrientdistillation_flow.png differ diff --git a/resources/assets/enderio/textures/blocks/nutrientdistillation_still.png b/resources/assets/enderio/textures/blocks/nutrientdistillation_still.png index c13e47ed..563eee0e 100644 Binary files a/resources/assets/enderio/textures/blocks/nutrientdistillation_still.png and b/resources/assets/enderio/textures/blocks/nutrientdistillation_still.png differ diff --git a/resources/assets/enderio/textures/items/bucketHootch.png b/resources/assets/enderio/textures/items/bucketHootch.png new file mode 100644 index 00000000..bdc4b57c Binary files /dev/null and b/resources/assets/enderio/textures/items/bucketHootch.png differ diff --git a/resources/assets/enderio/textures/items/bucketNutrientDistillation.png b/resources/assets/enderio/textures/items/bucketNutrientDistillation.png index abbb890b..5727d706 100644 Binary files a/resources/assets/enderio/textures/items/bucketNutrientDistillation.png and b/resources/assets/enderio/textures/items/bucketNutrientDistillation.png differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index f60f53c2..c3ed4a8b 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -145,6 +145,10 @@ public class EnderIO { public static BlockFluidEio blockNutrientDistillation; public static ItemBucketEio itemBucketNutrientDistillation; + public static Fluid fluidHootch; + public static BlockFluidEio blocHootch; + public static ItemBucketEio itemBucketHootch; + // Items public static ItemYetaWrench itemYetaWench; public static ItemConduitProbe itemConduitProbe; @@ -197,12 +201,18 @@ public class EnderIO { blockLightNode = BlockLightNode.create(); blockReservoir = BlockReservoir.create(); - Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION_UNLOCALISED_NAME).setDensity(1500).setViscosity(3000); + Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION_NAME).setDensity(1500).setViscosity(3000); FluidRegistry.registerFluid(f); fluidNutrientDistillation = FluidRegistry.getFluid(f.getName()); blockNutrientDistillation = BlockFluidEio.create(fluidNutrientDistillation, new MaterialLiquid(MapColor.brownColor)); itemBucketNutrientDistillation = ItemBucketEio.create(fluidNutrientDistillation); + f = new Fluid(Fluids.HOOTCH_NAME).setDensity(900).setViscosity(1000); + FluidRegistry.registerFluid(f); + fluidHootch = FluidRegistry.getFluid(f.getName()); + blocHootch = BlockFluidEio.create(fluidHootch, new MaterialLiquid(MapColor.grayColor)); + itemBucketHootch = ItemBucketEio.create(fluidHootch); + blockFusedQuartz = BlockFusedQuartz.create(); itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); diff --git a/src/main/java/crazypants/enderio/fluid/Fluids.java b/src/main/java/crazypants/enderio/fluid/Fluids.java index d33218fb..f9bf1e11 100644 --- a/src/main/java/crazypants/enderio/fluid/Fluids.java +++ b/src/main/java/crazypants/enderio/fluid/Fluids.java @@ -4,6 +4,7 @@ public class Fluids { public static final String NUTRIENT_DISTILLATION_NAME = "nutrientdistillation"; - public static final String NUTRIENT_DISTILLATION_UNLOCALISED_NAME = "nutrientDistillation"; + public static final String HOOTCH_NAME = "hootch"; + } diff --git a/src/main/java/crazypants/enderio/machine/still/TileVat.java b/src/main/java/crazypants/enderio/machine/still/TileVat.java index 7e797523..55248609 100644 --- a/src/main/java/crazypants/enderio/machine/still/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/still/TileVat.java @@ -179,4 +179,9 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler return currentTask; } + @Override + protected float getPowerUsePerTick() { + return 1; + } + }