diff --git a/build.gradle b/build.gradle index a91e7d827..8267f4a61 100644 --- a/build.gradle +++ b/build.gradle @@ -104,7 +104,7 @@ group = 'TechReborn' dependencies { - deobfCompile('RebornCore:RebornCore-1.12:+:universal') { + deobfCompile('RebornCore:RebornCore-1.12.1:+:universal') { transitive = false } deobfCompile "mezz.jei:jei_1.12:+" diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java index d31a9cd0e..baa366bc1 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -78,7 +78,7 @@ public class GuiIndustrialGrinder extends GuiBase { final Layer layer = Layer.FOREGROUND; this.builder.drawProgressBar(this, this.tile.getProgressScaled(100), 100, 105, 47, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); - this.builder.drawTank(this, 53, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); + this.builder.drawTank(this, 53, 25, mouseX, mouseY, this.tile.tank.getFluid(), this.tile.tank.getCapacity(), this.tile.tank.isEmpty(), layer); this.builder.drawMultiEnergyBar(this, 9, 19, (int) this.tile.getEnergy(), (int) this.tile.getMaxPower(), mouseX, mouseY, 0, layer); if (tile.getMutliBlock()) { addHologramButton(6, 4, 212, layer); diff --git a/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java index 1c83b7f5f..601bd622d 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java @@ -46,142 +46,153 @@ public class IndustrialGrinderRecipes extends RecipeMethods { static FluidStack SODIUM_PERSULFATE = new FluidStack(ModFluids.SODIUMPERSULFATE, 1000); public static void init() { + //Vanilla ores + if (oresExist("dustSmallThorium")) { + register(getOre("oreCoal"), WATER, 100, 64, getMaterial("coal", 2, Type.DUST), getOre("dustSmallThorium")); + } else { + register(getOre("oreCoal"), WATER, 100, 64, getMaterial("coal", 2, Type.DUST)); + } - register(getStack(Blocks.NETHERRACK, 16), WATER, 1600, 128, getMaterial("netherrack", 16, Type.DUST), getStack(Items.GOLD_NUGGET)); - register(getStack(Blocks.NETHERRACK, 8), MERCURY, 800, 128, getMaterial("netherrack", 8, Type.DUST), getStack(Items.GOLD_NUGGET)); + register(getOre("oreIron"), WATER, 100, 64, getMaterial("iron", 2, Type.DUST), getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", 1, Type.DUST)); + + register(getOre("oreGold"), WATER, 100, 64, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); + register(getOre("oreGold"), MERCURY, 100, 64, getMaterial("gold", 3, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); + register(getOre("oreGold"), SODIUM_PERSULFATE, 100, 64, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.DUST), getMaterial("nickel", Type.SMALL_DUST)); + + register(getOre("oreLapis"), WATER, 100, 64, getStack(Items.DYE, 12, 4), getMaterial("lazurite", 3, Type.DUST)); + + register(getOre("oreRedstone"), WATER, 100, 64, getStack(Items.REDSTONE, 10), getMaterial("glowstone", 2, Type.SMALL_DUST)); - register(getOre("oreCopper"), WATER, 100, 128, getMaterial("copper", 2, Type.DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); - register(getOre("oreCopper"), SODIUM_PERSULFATE, 100, 128, getMaterial("copper", 3, Type.DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); - register(getOre("oreCopper"), MERCURY, 100, 128, getMaterial("copper", 3, Type.DUST), getMaterial("gold", Type.DUST)); + register(getOre("oreDiamond"), WATER, 100, 64, getStack(Items.DIAMOND), getMaterial("diamond", 6, Type.SMALL_DUST), getMaterial("coal", Type.DUST)); - register(getOre("oreTin"), WATER, 100, 128, getMaterial("tin", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("zinc", Type.SMALL_DUST)); - register(getOre("oreTin"), SODIUM_PERSULFATE, 100, 128, getMaterial("tin", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("zinc", Type.DUST)); + register(getOre("oreEmerald"), WATER, 100, 64, getStack(Items.EMERALD), getMaterial("emerald", 6, Type.SMALL_DUST)); + + //TR ores + register(getOre("oreCopper"), WATER, 100, 64, getMaterial("copper", 2, Type.DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); + register(getOre("oreCopper"), SODIUM_PERSULFATE, 100, 64, getMaterial("copper", 3, Type.DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); + register(getOre("oreCopper"), MERCURY, 100, 64, getMaterial("copper", 3, Type.DUST), getMaterial("gold", Type.DUST)); + + register(getOre("oreTin"), WATER, 100, 64, getMaterial("tin", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("zinc", Type.SMALL_DUST)); + register(getOre("oreTin"), SODIUM_PERSULFATE, 100, 64, getMaterial("tin", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("zinc", Type.DUST)); + + register(getOre("oreLead"), WATER, 100, 64, getMaterial("lead", 2, Type.DUST), getMaterial("galena", 2, Type.SMALL_DUST)); + + register(getOre("oreSilver"), WATER, 100, 64, getMaterial("silver", 2, Type.DUST), getMaterial("galena", 2, Type.SMALL_DUST)); + + register(getOre("oreGalena"), WATER, 100, 64, getMaterial("galena", 2, Type.DUST), getMaterial("sulfur", Type.DUST)); + register(getOre("oreGalena"), MERCURY, 100, 64, getMaterial("galena", 2, Type.DUST), getMaterial("sulfur", Type.DUST), getMaterial("silver", Type.DUST)); + + register(BlockOre.getOreByName("bauxite"), WATER, 100, 64, getMaterial("bauxite", 4, Type.DUST), getMaterial("aluminum", Type.DUST)); + + register(getOre("oreIridium"), WATER, 100, 64, getMaterial("iridium", Type.INGOT), getMaterial("platinum", 2, Type.SMALL_DUST)); + register(getOre("oreIridium"), MERCURY, 100, 64, getMaterial("iridium", Type.INGOT), getMaterial("platinum", Type.DUST)); if (oresExist("oreUranium", "dustUranium", "smallDustPlutonium")) { - register(getOre("oreUranium"), WATER, 100, 128, getOre("dustUranium", 2), getOre("smallDustPlutonium")); + register(getOre("oreUranium"), WATER, 100, 64, getOre("dustUranium", 2), getOre("smallDustPlutonium")); } - - if (oresExist("dustSmallThorium")) { - register(getOre("oreCoal"), WATER, 100, 128, getMaterial("coal", 2, Type.DUST), getOre("dustSmallThorium")); - } else { - register(getOre("oreCoal"), WATER, 100, 128, getMaterial("coal", 2, Type.DUST)); - } - - register(getOre("oreIron"), WATER, 100, 128, getMaterial("iron", 2, Type.DUST), getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", 1, Type.DUST)); - register(getOre("oreLapis"), WATER, 100, 128, getStack(Items.DYE, 12, 4), getMaterial("lazurite", 3, Type.DUST)); - register(getOre("oreRedstone"), WATER, 100, 128, getStack(Items.REDSTONE, 10), getMaterial("glowstone", 2, Type.SMALL_DUST)); - - register(getOre("oreGold"), WATER, 100, 128, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); - register(getOre("oreGold"), MERCURY, 100, 128, getMaterial("gold", 3, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); - register(getOre("oreGold"), SODIUM_PERSULFATE, 100, 128, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.DUST), getMaterial("nickel", Type.SMALL_DUST)); - - register(getOre("oreDiamond"), WATER, 100, 128, getStack(Items.DIAMOND), getMaterial("diamond", 6, Type.SMALL_DUST), getMaterial("coal", Type.DUST)); - register(getOre("oreEmerald"), WATER, 100, 128, getStack(Items.EMERALD), getMaterial("emerald", 6, Type.SMALL_DUST)); - - register(getOre("oreGalena"), WATER, 100, 128, getMaterial("galena", 2, Type.DUST), getMaterial("sulfur", Type.DUST)); - register(getOre("oreGalena"), MERCURY, 100, 128, getMaterial("galena", 2, Type.DUST), getMaterial("sulfur", Type.DUST), getMaterial("silver", Type.DUST)); - - register(getOre("oreLead"), WATER, 100, 128, getMaterial("lead", 2, Type.DUST), getMaterial("galena", 2, Type.SMALL_DUST)); - register(getOre("oreSilver"), WATER, 100, 128, getMaterial("silver", 2, Type.DUST), getMaterial("galena", 2, Type.SMALL_DUST)); - - register(getOre("oreIridium"), WATER, 100, 128, getMaterial("iridium", Type.INGOT), getMaterial("platinum", 2, Type.SMALL_DUST)); - register(getOre("oreIridium"), MERCURY, 100, 128, getMaterial("iridium", Type.INGOT), getMaterial("platinum", Type.DUST)); - - register(getOre("oreRuby"), WATER, 100, 128, getMaterial("ruby", Type.GEM), getMaterial("ruby", 6, Type.SMALL_DUST), getMaterial("red_garnet", 2, Type.SMALL_DUST)); - register(getOre("oreSapphire"), WATER, 100, 128, getMaterial("sapphire", Type.GEM), getMaterial("sapphire", 6, Type.SMALL_DUST), getMaterial("peridot", 2, Type.SMALL_DUST)); - register(BlockOre.getOreByName("bauxite"), WATER, 100, 128, getMaterial("bauxite", 4, Type.DUST), getMaterial("aluminum", Type.DUST)); - register(getOre("oreQuartz"), WATER, 100, 128, getStack(Items.QUARTZ, 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); - register(getOre("orePyrite"), WATER, 100, 128, getMaterial("pyrite", 5, Type.DUST), getMaterial("sulfur", 2, Type.DUST)); - register(getOre("oreCinnabar"), WATER, 100, 128, getMaterial("cinnabar", 5, Type.DUST), getMaterial("redstone", 2, Type.SMALL_DUST), getMaterial("glowstone", Type.SMALL_DUST)); - - register(getOre("oreSphalerite"), WATER, 100, 128, getMaterial("sphalerite", 5, Type.DUST), getMaterial("zinc", Type.DUST), getMaterial("yellow_garnet", Type.SMALL_DUST)); - register(getOre("oreSphalerite"), SODIUM_PERSULFATE, 100, 128, getMaterial("sphalerite", 5, Type.DUST), getMaterial("zinc", 3, Type.DUST), getMaterial("yellow_garnet", Type.SMALL_DUST)); - - register(getOre("oreTungsten"), WATER, 100, 128, getMaterial("tungsten", 2, Type.DUST), getMaterial("iron", 3, Type.SMALL_DUST), getMaterial("manganese", 3, Type.SMALL_DUST)); - - register(getOre("oreSheldonite"), WATER, 100, 128, getMaterial("platinum", 2, Type.DUST), getMaterial("nickel", Type.DUST), getMaterial("iridium", 2, Type.NUGGET)); - register(getOre("oreSheldonite"), MERCURY, 100, 128, getMaterial("platinum", 3, Type.DUST), getMaterial("nickel", Type.DUST), getMaterial("iridium", 2, Type.NUGGET)); - - register(getOre("orePeridot"), WATER, 100, 128, getMaterial("peridot", Type.GEM), getMaterial("peridot", 6, Type.SMALL_DUST), getMaterial("emerald", 2, Type.SMALL_DUST)); - register(getOre("oreSodalite"), WATER, 100, 128, getMaterial("sodalite", 12, Type.DUST), getMaterial("aluminum", 3, Type.DUST)); - - if (oresExist("oreApatite", "gemApatite")) { - register(getOre("oreApatite"), WATER, 100, 128, getOre("gemApatite", 8), getMaterial("phosphorous", 2, Type.SMALL_DUST)); - } - - if (oresExist("oreCertusQuartz", "crystalCertusQuartz", "dustCertusQuartz")) { - register(getOre("oreCertusQuartz"), WATER, 100, 128, getOre("crystalCertusQuartz", 2), getOre("dustCertusQuartz")); - } - - if (oresExist("oreChargedCertusQuartz", "crystalChargedCertusQuartz", "dustCertusQuartz")) { - register(getOre("oreChargedCertusQuartz"), WATER, 100, 128, getOre("crystalChargedCertusQuartz", 2), getOre("dustCertusQuartz", 2)); - } - - if (oresExist("oreNickel")) { - register(getOre("oreNickel"), WATER, 100, 128, getMaterial("nickel", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.SMALL_DUST)); - register(getOre("oreNickel"), MERCURY, 100, 128, getMaterial("nickel", 3, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.DUST)); - register(getOre("oreNickel"), SODIUM_PERSULFATE, 100, 128, getMaterial("nickel", 3, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.SMALL_DUST)); - } - - if (oresExist("oreZinc")) { - register(getOre("oreZinc"), WATER, 100, 128, getMaterial("zinc", 2, Type.DUST), getMaterial("iron", 2, Type.SMALL_DUST), getMaterial("tin", Type.SMALL_DUST)); - register(getOre("oreZinc"), SODIUM_PERSULFATE, 100, 128, getMaterial("zinc", 2, Type.DUST), getMaterial("iron", Type.DUST), getMaterial("tin", Type.SMALL_DUST)); - } - - if (oresExist("oreAmethyst", "gemAmethyst")) { - register(getOre("oreAmethyst"), WATER, 100, 128, getOre("gemAmethyst", 2)); - } - - if (oresExist("oreTopaz", "gemTopaz")) { - register(getOre("oreTopaz"), WATER, 100, 128, getOre("gemTopaz", 2)); - } - - if (oresExist("oreTanzanite", "gemTanzanite")) { - register(getOre("oreTanzanite"), WATER, 100, 128, getOre("gemTanzanite", 2)); - } - - if (oresExist("oreMalachite", "gemMalachite")) { - register(getOre("oreMalachite"), WATER, 100, 128, getOre("gemMalachite", 2)); - } - + if (oresExist("oreUranium", "uran238", "smallUran235")) { - register(getOre("oreUranium"), WATER, 100, 128, getOre("uran238", 8), getOre("smallUran235", 2)); + register(getOre("oreUranium"), WATER, 100, 64, getOre("uran238", 8), getOre("smallUran235", 2)); } if (oresExist("orePitchblende", "uran238", "uran235")) { - register(getOre("orePitchblende"), WATER, 100, 128, getOre("uran238", 8), getOre("smallUran235", 2)); + register(getOre("orePitchblende"), WATER, 100, 64, getOre("uran238", 8), getOre("smallUran235", 2)); + } + + register(getOre("oreRuby"), WATER, 100, 64, getMaterial("ruby", Type.GEM), getMaterial("ruby", 6, Type.SMALL_DUST), getMaterial("red_garnet", 2, Type.SMALL_DUST)); + + register(getOre("oreSapphire"), WATER, 100, 64, getMaterial("sapphire", Type.GEM), getMaterial("sapphire", 6, Type.SMALL_DUST), getMaterial("peridot", 2, Type.SMALL_DUST)); + + register(getOre("oreQuartz"), WATER, 100, 64, getStack(Items.QUARTZ, 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); + + register(getOre("orePyrite"), WATER, 100, 64, getMaterial("pyrite", 5, Type.DUST), getMaterial("sulfur", 2, Type.DUST)); + + register(getOre("oreCinnabar"), WATER, 100, 64, getMaterial("cinnabar", 5, Type.DUST), getMaterial("redstone", 2, Type.SMALL_DUST), getMaterial("glowstone", Type.SMALL_DUST)); + + register(getOre("oreSphalerite"), WATER, 100, 64, getMaterial("sphalerite", 5, Type.DUST), getMaterial("zinc", Type.DUST), getMaterial("yellow_garnet", Type.SMALL_DUST)); + register(getOre("oreSphalerite"), SODIUM_PERSULFATE, 100, 64, getMaterial("sphalerite", 5, Type.DUST), getMaterial("zinc", 3, Type.DUST), getMaterial("yellow_garnet", Type.SMALL_DUST)); + + register(getOre("oreTungsten"), WATER, 100, 64, getMaterial("tungsten", 2, Type.DUST), getMaterial("iron", 3, Type.SMALL_DUST), getMaterial("manganese", 3, Type.SMALL_DUST)); + + register(getOre("oreSheldonite"), WATER, 100, 64, getMaterial("platinum", 2, Type.DUST), getMaterial("nickel", Type.DUST), getMaterial("iridium", 2, Type.NUGGET)); + register(getOre("oreSheldonite"), MERCURY, 100, 64, getMaterial("platinum", 3, Type.DUST), getMaterial("nickel", Type.DUST), getMaterial("iridium", 2, Type.NUGGET)); + + register(getOre("orePeridot"), WATER, 100, 64, getMaterial("peridot", Type.GEM), getMaterial("peridot", 6, Type.SMALL_DUST), getMaterial("emerald", 2, Type.SMALL_DUST)); + + register(getOre("oreSodalite"), WATER, 100, 64, getMaterial("sodalite", 12, Type.DUST), getMaterial("aluminum", 3, Type.DUST)); + + if (oresExist("oreApatite", "gemApatite")) { + register(getOre("oreApatite"), WATER, 100, 64, getOre("gemApatite", 8), getMaterial("phosphorous", 2, Type.SMALL_DUST)); + } + + if (oresExist("oreCertusQuartz", "crystalCertusQuartz", "dustCertusQuartz")) { + register(getOre("oreCertusQuartz"), WATER, 100, 64, getOre("crystalCertusQuartz", 2), getOre("dustCertusQuartz")); + } + + if (oresExist("oreChargedCertusQuartz", "crystalChargedCertusQuartz", "dustCertusQuartz")) { + register(getOre("oreChargedCertusQuartz"), WATER, 100, 64, getOre("crystalChargedCertusQuartz", 2), getOre("dustCertusQuartz", 2)); + } + + if (oresExist("oreNickel")) { + register(getOre("oreNickel"), WATER, 100, 64, getMaterial("nickel", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.SMALL_DUST)); + register(getOre("oreNickel"), MERCURY, 100, 64, getMaterial("nickel", 3, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.DUST)); + register(getOre("oreNickel"), SODIUM_PERSULFATE, 100, 64, getMaterial("nickel", 3, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.SMALL_DUST)); + } + + if (oresExist("oreZinc")) { + register(getOre("oreZinc"), WATER, 100, 64, getMaterial("zinc", 2, Type.DUST), getMaterial("iron", 2, Type.SMALL_DUST), getMaterial("tin", Type.SMALL_DUST)); + register(getOre("oreZinc"), SODIUM_PERSULFATE, 100, 64, getMaterial("zinc", 2, Type.DUST), getMaterial("iron", Type.DUST), getMaterial("tin", Type.SMALL_DUST)); + } + + if (oresExist("oreAmethyst", "gemAmethyst")) { + register(getOre("oreAmethyst"), WATER, 100, 64, getOre("gemAmethyst", 2)); + } + + if (oresExist("oreTopaz", "gemTopaz")) { + register(getOre("oreTopaz"), WATER, 100, 64, getOre("gemTopaz", 2)); + } + + if (oresExist("oreTanzanite", "gemTanzanite")) { + register(getOre("oreTanzanite"), WATER, 100, 64, getOre("gemTanzanite", 2)); + } + + if (oresExist("oreMalachite", "gemMalachite")) { + register(getOre("oreMalachite"), WATER, 100, 64, getOre("gemMalachite", 2)); } if (oresExist("oreAluminum")) { - register(getOre("oreAluminum"), WATER, 100, 128, getMaterial("aluminum", 2, Type.DUST), getMaterial("bauxite", 2, Type.SMALL_DUST)); + register(getOre("oreAluminum"), WATER, 100, 64, getMaterial("aluminum", 2, Type.DUST), getMaterial("bauxite", 2, Type.SMALL_DUST)); } if (oresExist("oreArdite", "dustArdite")) { - register(getOre("oreArdite"), WATER, 100, 128, getOre("dustArdite", 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); + register(getOre("oreArdite"), WATER, 100, 64, getOre("dustArdite", 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); } if (oresExist("oreCobalt", "dustCobalt")) { - register(getOre("oreCobalt"), WATER, 100, 128, getOre("dustCobalt", 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); + register(getOre("oreCobalt"), WATER, 100, 64, getOre("dustCobalt", 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); } if (oresExist("oreOsmium", "dustOsmium")) { - register(getOre("oreOsmium"), WATER, 100, 128, getOre("dustOsmium", 2), getMaterial("platinum", 2, Type.SMALL_DUST), getMaterial("iron", 1, Type.SMALL_DUST)); + register(getOre("oreOsmium"), WATER, 100, 64, getOre("dustOsmium", 2), getMaterial("platinum", 2, Type.SMALL_DUST), getMaterial("iron", 1, Type.SMALL_DUST)); } if (oresExist("oreTeslatite", "dustTeslatite")) { - register(getOre("oreTeslatite"), WATER, 100, 128, getOre("dustTeslatite", 2), getMaterial("redstone", 3, Type.SMALL_DUST)); + register(getOre("oreTeslatite"), WATER, 100, 64, getOre("dustTeslatite", 2), getMaterial("redstone", 3, Type.SMALL_DUST)); } if (oresExist("oreSulfur")) { - register(getOre("oreSulfur"), WATER, 100, 128, getMaterial("sulfur", 2, Type.DUST), getMaterial("sulfur", Type.SMALL_DUST)); + register(getOre("oreSulfur"), WATER, 100, 64, getMaterial("sulfur", 2, Type.DUST), getMaterial("sulfur", Type.SMALL_DUST)); } if (oresExist("oreSaltpeter")) { - register(getOre("oreSaltpeter"), WATER, 100, 128, getMaterial("saltpeter", 2, Type.DUST), getMaterial("saltpeter", Type.SMALL_DUST)); + register(getOre("oreSaltpeter"), WATER, 100, 64, getMaterial("saltpeter", 2, Type.DUST), getMaterial("saltpeter", Type.SMALL_DUST)); } - register(new ItemStack(Blocks.END_STONE), WATER, 100, 128, getMaterial("endstone", 2, Type.DUST)); - register(new ItemStack(Blocks.END_BRICKS), WATER, 100, 128, getMaterial("endstone", 4, Type.DUST)); + register(getStack(Blocks.NETHERRACK, 16), WATER, 1600, 64, getMaterial("netherrack", 16, Type.DUST), getStack(Items.GOLD_NUGGET)); + register(getStack(Blocks.NETHERRACK, 8), MERCURY, 800, 64, getMaterial("netherrack", 8, Type.DUST), getStack(Items.GOLD_NUGGET)); + + register(new ItemStack(Blocks.END_STONE), WATER, 100, 64, getMaterial("endstone", 2, Type.DUST)); + register(new ItemStack(Blocks.END_BRICKS), WATER, 100, 64, getMaterial("endstone", 4, Type.DUST)); } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index 54090183a..473ace869 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -33,6 +33,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.FluidEvent; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.recipe.IRecipeCrafterProvider; @@ -55,15 +56,17 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha ITileRecipeHandler, IRecipeCrafterProvider, IContainerProvider { public static final int TANK_CAPACITY = 16000; - public Inventory inventory = new Inventory(7, "TileGrinder", 64, this); - public Tank tank = new Tank("TileGrinder", TileIndustrialGrinder.TANK_CAPACITY, this); + public Inventory inventory; + public Tank tank; public RecipeCrafter crafter; public MultiblockChecker multiblockChecker; public TileIndustrialGrinder() { super(); // TODO configs - + + tank = new Tank("TileIndustrialGrinder", TileIndustrialGrinder.TANK_CAPACITY, this); + inventory = new Inventory(7, "TileIndustrialGrinder", 64, this); final int[] inputs = new int[2]; inputs[0] = 0; inputs[1] = 1; @@ -128,7 +131,13 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha if (this.getMutliBlock()) { this.crafter.updateEntity(); } - FluidUtils.drainContainers(this.tank, this.inventory, 1, 6); + + if (!this.inventory.getStackInSlot(1).isEmpty()){ + FluidUtils.drainContainers(this.tank, this.inventory, 1, 6); + FluidUtils.fillContainers(this.tank, this.inventory, 1, 6, this.tank.getFluidType()); + this.syncWithAll(); + } + } @Override @@ -255,10 +264,13 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha } if (tankFluid.isFluidEqual(recipeFluid)) { if (tankFluid.amount >= recipeFluid.amount) { - if (tankFluid.amount == recipeFluid.amount) + if (tankFluid.amount == recipeFluid.amount) { this.tank.setFluid(null); - else + } + else { tankFluid.amount -= recipeFluid.amount; + } + this.syncWithAll(); return true; } }