Merge branch 'master' into fix-heat-exchanger-fluid-input

dependencies.gradle

@@ -49,7 +49,7 @@ dependencies {
 
  compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev')
  compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev")
- compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.12:dev")
+ compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.13:dev")
  implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
  // Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath
  compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}

src/main/java/gregtech/api/recipe/RecipeMaps.java

@@ -26,6 +26,7 @@
 import java.util.Optional;
 
 import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -85,6 +86,7 @@
 import gregtech.nei.formatter.FusionSpecialValueFormatter;
 import gregtech.nei.formatter.HeatingCoilSpecialValueFormatter;
 import gregtech.nei.formatter.SimpleSpecialValueFormatter;
+import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import mods.railcraft.common.blocks.aesthetics.cube.EnumCube;
 import mods.railcraft.common.items.RailcraftToolItems;
@@ -685,6 +687,22 @@ else if (Materials.PhasedIron.getMolten(1)
  .setOutputs(aOutput1, aOutput2, Materials.Ash.getDust(aCoalAmount / 2))
  .setDuration(aDuration * 20 / 3);
  }
+ ItemStack cactusCokeBlock = new ItemStack(
+ Item.getItemFromBlock(ModBlocks.blockCactusCoke),
+ aCoalAmount * 2,
+ 0);
+ ItemStack sugarCokeBlock = new ItemStack(
+ Item.getItemFromBlock(ModBlocks.blockSugarCoke),
+ aCoalAmount * 2,
+ 0);
+ coll.derive()
+ .setInputs(aInput1, aInput2, cactusCokeBlock)
+ .setOutputs(aOutput1, aOutput2, Materials.Ash.getDust(aCoalAmount * 2))
+ .setDuration(aDuration * 20 / 3);
+ coll.derive()
+ .setInputs(aInput1, aInput2, sugarCokeBlock)
+ .setOutputs(aOutput1, aOutput2, Materials.Ash.getDust(aCoalAmount * 2))
+ .setDuration(aDuration * 20 / 3);
  }
  return coll.getAll();
  })

src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java

@@ -81,7 +81,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
  else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) {
 
  GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(1, aStack))
+ .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1))
  .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
  .fluidInputs(
  Materials.Water.getFluid(
@@ -93,7 +93,7 @@ else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) {
  .addTo(cutterRecipes);
 
  GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(1, aStack))
+ .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1))
  .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
  .fluidInputs(
  GTModHandler.getDistilledWater(
@@ -105,7 +105,7 @@ else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) {
  .addTo(cutterRecipes);
 
  GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(1, aStack))
+ .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1))
  .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
  .fluidInputs(
  Materials.Lubricant.getFluid(
@@ -154,7 +154,7 @@ else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) {
 
  if (tStack2 != null) {
  GTValues.RA.stdBuilder()
- .itemInputs(aStack)
+ .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1))
  .itemOutputs(tStack2)
  .duration(5 * SECONDS)
  .eut(24)

src/main/java/gtPlusPlus/core/block/ModBlocks.java

@@ -4,6 +4,10 @@
 import net.minecraftforge.fluids.Fluid;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.fuel.BlockCactusCharcoal;
+import gtPlusPlus.core.block.fuel.BlockCactusCoke;
+import gtPlusPlus.core.block.fuel.BlockSugarCharcoal;
+import gtPlusPlus.core.block.fuel.BlockSugarCoke;
 import gtPlusPlus.core.block.general.BlockCompressedObsidian;
 import gtPlusPlus.core.block.general.BlockFluidTankInfinite;
 import gtPlusPlus.core.block.general.BlockHellFire;
@@ -53,6 +57,11 @@ public final class ModBlocks {
  public static Block blockWitherGuard;
  public static Block blockCompressedObsidian;
 
+ public static Block blockCactusCharcoal;
+ public static Block blockCactusCoke;
+ public static Block blockSugarCharcoal;
+ public static Block blockSugarCoke;
+
  public static Block blockCustomJukebox;
 
  public static Block blockPooCollector;
@@ -82,6 +91,11 @@ public static void registerBlocks() {
  blockWitherGuard = new BlockWitherProof();
  blockCompressedObsidian = new BlockCompressedObsidian();
 
+ blockCactusCharcoal = new BlockCactusCharcoal();
+ blockCactusCoke = new BlockCactusCoke();
+ blockSugarCharcoal = new BlockSugarCharcoal();
+ blockSugarCoke = new BlockSugarCoke();
+
  blockCircuitProgrammer = new BlockCircuitProgrammer();
 
  blockDecayablesChest = new BlockDecayablesChest();

src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCharcoal.java

@@ -0,0 +1,55 @@
+package gtPlusPlus.core.block.fuel;
+
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
+public class BlockCactusCharcoal extends Block {
+
+ private final IIcon[] textureArray = new IIcon[6];
+
+ public BlockCactusCharcoal() {
+ super(Material.rock);
+ this.setBlockName("blockCactusCharcoal");
+ this.setStepSound(soundTypeStone);
+ GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockCactusCharcoal");
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void registerBlockIcons(IIconRegister iconRegister) {
+ for (int i = 0; i < textureArray.length; i++) {
+ this.textureArray[i] = iconRegister.registerIcon(GTPlusPlus.ID + ":fuel/blockCactusCharcoal" + i);
+ }
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public IIcon getIcon(int side, int meta) {
+ return this.textureArray[meta];
+ }
+
+ @Override
+ public void getSubBlocks(final Item item, final CreativeTabs tab, final List<ItemStack> list) {
+ for (int i = 0; i < textureArray.length; i++) {
+ ItemStack is = new ItemStack(item, 1, i);
+ ItemUtils.registerFuel(is, 4000 * (int) Math.pow(9, i));
+ list.add(is);
+ }
+ }
+
+}

src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCoke.java

@@ -0,0 +1,55 @@
+package gtPlusPlus.core.block.fuel;
+
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
+public class BlockCactusCoke extends Block {
+
+ private final IIcon[] textureArray = new IIcon[6];
+
+ public BlockCactusCoke() {
+ super(Material.rock);
+ this.setBlockName("blockCactusCoke");
+ this.setStepSound(soundTypeStone);
+ GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockCactusCoke");
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void registerBlockIcons(IIconRegister iconRegister) {
+ for (int i = 0; i < textureArray.length; i++) {
+ this.textureArray[i] = iconRegister.registerIcon(GTPlusPlus.ID + ":fuel/blockCactusCoke" + i);
+ }
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public IIcon getIcon(int side, int meta) {
+ return this.textureArray[meta];
+ }
+
+ @Override
+ public void getSubBlocks(final Item item, final CreativeTabs tab, final List<ItemStack> list) {
+ for (int i = 0; i < textureArray.length; i++) {
+ ItemStack is = new ItemStack(item, 1, i);
+ ItemUtils.registerFuel(is, 8000 * (int) Math.pow(9, i));
+ list.add(is);
+ }
+ }
+
+}

src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCharcoal.java

@@ -0,0 +1,55 @@
+package gtPlusPlus.core.block.fuel;
+
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
+public class BlockSugarCharcoal extends Block {
+
+ private final IIcon[] textureArray = new IIcon[6];
+
+ public BlockSugarCharcoal() {
+ super(Material.rock);
+ this.setBlockName("blockSugarCharcoal");
+ this.setStepSound(soundTypeStone);
+ GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockSugarCharcoal");
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void registerBlockIcons(IIconRegister iconRegister) {
+ for (int i = 0; i < textureArray.length; i++) {
+ this.textureArray[i] = iconRegister.registerIcon(GTPlusPlus.ID + ":fuel/blockSugarCharcoal" + i);
+ }
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public IIcon getIcon(int side, int meta) {
+ return this.textureArray[meta];
+ }
+
+ @Override
+ public void getSubBlocks(final Item item, final CreativeTabs tab, final List<ItemStack> list) {
+ for (int i = 0; i < textureArray.length; i++) {
+ ItemStack is = new ItemStack(item, 1, i);
+ ItemUtils.registerFuel(is, 4000 * (int) Math.pow(9, i));
+ list.add(is);
+ }
+ }
+
+}

src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCoke.java

@@ -0,0 +1,55 @@
+package gtPlusPlus.core.block.fuel;
+
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
+public class BlockSugarCoke extends Block {
+
+ private final IIcon[] textureArray = new IIcon[6];
+
+ public BlockSugarCoke() {
+ super(Material.rock);
+ this.setBlockName("blockSugarCoke");
+ this.setStepSound(soundTypeStone);
+ GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockSugarCoke");
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void registerBlockIcons(IIconRegister iconRegister) {
+ for (int i = 0; i < textureArray.length; i++) {
+ this.textureArray[i] = iconRegister.registerIcon(GTPlusPlus.ID + ":fuel/blockSugarCoke" + i);
+ }
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public IIcon getIcon(int side, int meta) {
+ return this.textureArray[meta];
+ }
+
+ @Override
+ public void getSubBlocks(final Item item, final CreativeTabs tab, final List<ItemStack> list) {
+ for (int i = 0; i < textureArray.length; i++) {
+ ItemStack is = new ItemStack(item, 1, i);
+ ItemUtils.registerFuel(is, 8000 * (int) Math.pow(9, i));
+ list.add(is);
+ }
+ }
+
+}