diff --git a/dependencies.gradle b/dependencies.gradle index 8231ca19770..c474909bc68 100644 --- a/dependencies.gradle +++ b/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} diff --git a/src/main/java/bartworks/system/material/WerkstoffLoader.java b/src/main/java/bartworks/system/material/WerkstoffLoader.java index 38ccdc90972..5b485b99053 100644 --- a/src/main/java/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/bartworks/system/material/WerkstoffLoader.java @@ -1049,6 +1049,7 @@ public static void setUp() { new Werkstoff.GenerationFeatures().onlyDust() .addMolten() .addMetalItems() + .addCraftingMetalWorkingItems() .enforceUnification(), 64, TextureSet.SET_METALLIC @@ -1236,6 +1237,7 @@ public static void setUp() { .onlyDust() .addMetalItems() .addMolten() + .addCraftingMetalWorkingItems() .enforceUnification(), 78, TextureSet.SET_METALLIC); diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java index d72d5c405d5..197c15875d9 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMaps.java +++ b/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; @@ -681,6 +683,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(); }) diff --git a/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java index 48ecc4626d3..59e4ca8cb9e 100644 --- a/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java @@ -1937,7 +1937,7 @@ public void accept(GTBeeDefinition dis) { JUPITER(GTBranchDefinition.PLANET, "Jupiter", false, new Color(0x734B2E), new Color(0xD0CBC4), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.35f); beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoIceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(Materials.CallistoIce.getDust(1), 0.05f); beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, 0), 0.05f); beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, 0), 0.05f); beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1, 0), 0.05f); @@ -1991,7 +1991,7 @@ public void accept(GTBeeDefinition dis) { CALLISTO(GTBranchDefinition.PLANET, "Callisto", true, new Color(0x0f333d), new Color(0x0d84a5), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.25f); beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.10f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoIceDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(Materials.CallistoIce.getDust(1), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index 056feb0b33c..bedbb2d41ea 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/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) diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java index 6169581257e..b812a4739e9 100644 --- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java +++ b/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(); diff --git a/src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCharcoal.java b/src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCharcoal.java new file mode 100644 index 00000000000..193ca79c5d6 --- /dev/null +++ b/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 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); + } + } + +} diff --git a/src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCoke.java b/src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCoke.java new file mode 100644 index 00000000000..5c01fb20c8c --- /dev/null +++ b/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 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); + } + } + +} diff --git a/src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCharcoal.java b/src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCharcoal.java new file mode 100644 index 00000000000..2fa755ea9c7 --- /dev/null +++ b/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 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); + } + } + +} diff --git a/src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCoke.java b/src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCoke.java new file mode 100644 index 00000000000..1ef9c3167ea --- /dev/null +++ b/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 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); + } + } + +} diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java index 476e49248f1..45329aac169 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java @@ -3,6 +3,7 @@ import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gtPlusPlus.core.recipe.common.CI.bitsd; @@ -58,6 +59,7 @@ public static void loadRecipes() { OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase, 2); run(); addCompressedObsidian(); + addFuelBlocks(); migratedRecipes(); } @@ -273,6 +275,65 @@ private static void run() { .addTo(assemblerRecipes); } + private static void addFuelBlocks() { + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(ModItems.itemCactusCharcoal, 9, 0)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockCactusCharcoal, 0, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(ModItems.itemCactusCoke, 9, 0)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockCactusCoke, 0, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(ModItems.itemSugarCharcoal, 9, 0)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockSugarCharcoal, 0, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(ModItems.itemSugarCoke, 9, 0)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockSugarCoke, 0, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + for (int i = 1; i < 6; i++) { + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.simpleMetaStack(ModBlocks.blockCactusCharcoal, i - 1, 9)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockCactusCharcoal, i, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + } + for (int i = 1; i < 6; i++) { + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.simpleMetaStack(ModBlocks.blockCactusCoke, i - 1, 9)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockCactusCoke, i, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + } + for (int i = 1; i < 6; i++) { + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.simpleMetaStack(ModBlocks.blockSugarCharcoal, i - 1, 9)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockSugarCharcoal, i, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + } + for (int i = 1; i < 6; i++) { + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.simpleMetaStack(ModBlocks.blockSugarCoke, i - 1, 9)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockSugarCoke, i, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + } + } + private static boolean addCompressedObsidian() { // Invert Obsidian ItemStack aInvertedObsidian = ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1); diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index 047d3340793..db483cc68a2 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -202,6 +202,32 @@ tile.blockCompressedObsidian.9.name=Quadruple Compressed Glowstone (6561) tile.blockCompressedObsidian.10.name=Quintuple Compressed Glowstone (59049) tile.blockNet.name=Net +# Fuel Blocks +tile.blockCactusCharcoal.0.name=Cactus Charcoal +tile.blockCactusCharcoal.1.name=Compressed Cactus Charcoal +tile.blockCactusCharcoal.2.name=Double Compressed Cactus Charcoal +tile.blockCactusCharcoal.3.name=Triple Compressed Cactus Charcoal +tile.blockCactusCharcoal.4.name=Quadruple Compressed Cactus Charcoal +tile.blockCactusCharcoal.5.name=Quintuple Compressed Cactus Charcoal +tile.blockCactusCoke.0.name=Cactus Coke +tile.blockCactusCoke.1.name=Compressed Cactus Coke +tile.blockCactusCoke.2.name=Double Compressed Cactus Coke +tile.blockCactusCoke.3.name=Triple Compressed Cactus Coke +tile.blockCactusCoke.4.name=Quadruple Compressed Cactus Coke +tile.blockCactusCoke.5.name=Quintuple Compressed Cactus Coke +tile.blockSugarCharcoal.0.name=Sugar Charcoal +tile.blockSugarCharcoal.1.name=Compressed Sugar Charcoal +tile.blockSugarCharcoal.2.name=Double Compressed Sugar Charcoal +tile.blockSugarCharcoal.3.name=Triple Compressed Sugar Charcoal +tile.blockSugarCharcoal.4.name=Quadruple Compressed Sugar Charcoal +tile.blockSugarCharcoal.5.name=Quintuple Compressed Sugar Charcoal +tile.blockSugarCoke.0.name=Sugar Coke +tile.blockSugarCoke.1.name=Compressed Sugar Coke +tile.blockSugarCoke.2.name=Double Compressed Sugar Coke +tile.blockSugarCoke.3.name=Triple Compressed Sugar Coke +tile.blockSugarCoke.4.name=Quadruple Compressed Sugar Coke +tile.blockSugarCoke.5.name=Quintuple Compressed Sugar Coke + # GT++ Items diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal0.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal0.png new file mode 100644 index 00000000000..ff7e412f64b Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal0.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal1.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal1.png new file mode 100644 index 00000000000..910f192f6c4 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal1.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal2.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal2.png new file mode 100644 index 00000000000..69bb6236d46 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal2.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal3.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal3.png new file mode 100644 index 00000000000..d282b84383a Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal3.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal4.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal4.png new file mode 100644 index 00000000000..a9ce2bad028 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal4.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal5.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal5.png new file mode 100644 index 00000000000..d7ebebb6fc7 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal5.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke0.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke0.png new file mode 100644 index 00000000000..5e0f2f93d77 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke0.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke1.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke1.png new file mode 100644 index 00000000000..d66d733bba5 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke1.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke2.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke2.png new file mode 100644 index 00000000000..f59550f3adb Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke2.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke3.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke3.png new file mode 100644 index 00000000000..20660c34dee Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke3.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke4.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke4.png new file mode 100644 index 00000000000..68370f743e6 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke4.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke5.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke5.png new file mode 100644 index 00000000000..49cf033b0c3 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke5.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal0.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal0.png new file mode 100644 index 00000000000..f4ef893eb14 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal0.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal1.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal1.png new file mode 100644 index 00000000000..4b350b60de7 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal1.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal2.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal2.png new file mode 100644 index 00000000000..5f8a9a4425e Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal2.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal3.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal3.png new file mode 100644 index 00000000000..8aea97b487c Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal3.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal4.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal4.png new file mode 100644 index 00000000000..39cc7f6a070 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal4.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal5.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal5.png new file mode 100644 index 00000000000..ab6531ef3a9 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal5.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke0.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke0.png new file mode 100644 index 00000000000..158cd06cdee Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke0.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke1.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke1.png new file mode 100644 index 00000000000..239c72076f5 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke1.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke2.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke2.png new file mode 100644 index 00000000000..42e3336832f Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke2.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke3.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke3.png new file mode 100644 index 00000000000..54d21e20ad8 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke3.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke4.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke4.png new file mode 100644 index 00000000000..6a5036461c0 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke4.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke5.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke5.png new file mode 100644 index 00000000000..15e336931ab Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke5.png differ