From bd2adf690287e15f3264ae69fed5a010b53e88a3 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Fri, 29 Jul 2016 04:16:44 +1000 Subject: + Added Frameboxes with Colours and Names. + Added config option for the Division Sigil. --- src/Java/miscutil/MiscUtils.java | 3 ++ src/Java/miscutil/core/block/ModBlocks.java | 13 ++++--- .../miscutil/core/block/base/BlockBaseModular.java | 44 ++++++++++++++++++++-- .../core/common/compat/COMPAT_ExtraUtils.java | 23 ++++++----- src/Java/miscutil/core/item/ModItems.java | 8 +--- .../core/item/base/itemblock/ItemBlockBase.java | 6 +-- .../item/base/itemblock/ItemBlockGtFrameBox.java | 15 +++++--- src/Java/miscutil/core/lib/CORE.java | 5 ++- 8 files changed, 81 insertions(+), 36 deletions(-) (limited to 'src/Java') diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java index 3e717b729c..8d0fb907b2 100644 --- a/src/Java/miscutil/MiscUtils.java +++ b/src/Java/miscutil/MiscUtils.java @@ -6,6 +6,7 @@ import static miscutil.core.lib.CORE.configSwitches.disableEnderIOIntegration; import static miscutil.core.lib.CORE.configSwitches.disableIC2Recipes; import static miscutil.core.lib.CORE.configSwitches.disableStaballoyBlastFurnaceRecipe; import static miscutil.core.lib.CORE.configSwitches.enableAlternativeBatteryAlloy; +import static miscutil.core.lib.CORE.configSwitches.enableAlternativeDivisionSigilRecipe; import static miscutil.core.lib.CORE.configSwitches.enableSolarGenerators; import static miscutil.core.lib.CORE.configSwitches.enableThaumcraftShardUnification; import gregtech.api.util.GT_Config; @@ -60,6 +61,8 @@ implements ActionListener enableThaumcraftShardUnification = config.getBoolean("enableThaumcraftShardUnification", "machines", false, "Allows the use of TC shards across many recipes by oreDicting them into a common group."); enableAlternativeBatteryAlloy = config.getBoolean("enableAlternativeBatteryAlloy", "machines", false, "Adds a non-Antimony using Battery Alloy. Not Balanced at all.."); disableIC2Recipes = config.getBoolean("disableIC2Recipes", "machines", false, "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks."); + enableAlternativeDivisionSigilRecipe = config.getBoolean("enableAlternativeDivisionSigilRecipe", "machines", false, "Utilizes Neutronium instead."); + config.save(); } diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java index 392579eb99..e4010f1c95 100644 --- a/src/Java/miscutil/core/block/ModBlocks.java +++ b/src/Java/miscutil/core/block/ModBlocks.java @@ -2,9 +2,10 @@ package miscutil.core.block; import miscutil.core.block.base.BasicBlock; import miscutil.core.block.base.BasicBlock.BlockTypes; +import miscutil.core.block.base.BlockBaseModular; import miscutil.core.block.general.LightGlass; import miscutil.core.block.general.fluids.FluidRegistryHandler; -import miscutil.core.block.machine.BlockGtFrameBox; +import miscutil.core.item.base.itemblock.ItemBlockGtFrameBox; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; @@ -29,7 +30,7 @@ public final class ModBlocks { public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels"); public static Block blockFluidJackDaniels; - public static Block blockGtFrameSet1; + public static Block blockGtFrameStaballoy; public static Block blockGtFrameTantalloy60; public static Block blockGtFrameTantalloy61; @@ -72,10 +73,10 @@ public final class ModBlocks { //GameRegistry.registerBlock(blockGriefSaver, "blockGriefSaver"); //GtFrames - GameRegistry.registerBlock(blockGtFrameSet1 = new BlockGtFrameBox("blockGtFrameSet1", Material.iron ,BlockTypes.FRAME, true, Utils.rgbtoHexValue(68, 75, 66), Utils.rgbtoHexValue(68, 75, 166), Utils.rgbtoHexValue(122, 135, 196)), "blockGtFrameSet1"); - //GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameTantalloy60", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 166)), "blockGtFrameTantalloy60"); - //GameRegistry.registerBlock(blockGtFrameTantalloy61 = new BlockBaseModular("blockGtFrameTantalloy61", BlockTypes.FRAME, Utils.rgbtoHexValue(122, 135, 196)), "blockGtFrameTantalloy61"); - + //GameRegistry.registerBlock(blockGtFrameSet1 = new BlockGtFrameBox("blockGtFrameSet1", Material.iron ,BlockTypes.FRAME, true, Utils.rgbtoHexValue(68, 75, 66), Utils.rgbtoHexValue(68, 75, 166), Utils.rgbtoHexValue(122, 135, 196)), "blockGtFrameSet1"); + GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameStaballoy", "Staballoy", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 66)), ItemBlockGtFrameBox.class, "blockGtFrameStaballoy"); + GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameTantalloy60", "Tantalloy-60", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 166)), ItemBlockGtFrameBox.class, "blockGtFrameTantalloy60"); + GameRegistry.registerBlock(blockGtFrameTantalloy61 = new BlockBaseModular("blockGtFrameTantalloy61", "Tantalloy-61", BlockTypes.FRAME, Utils.rgbtoHexValue(122, 135, 196)), ItemBlockGtFrameBox.class, "blockGtFrameTantalloy61"); } } \ No newline at end of file diff --git a/src/Java/miscutil/core/block/base/BlockBaseModular.java b/src/Java/miscutil/core/block/base/BlockBaseModular.java index f8d965f6d7..19f40c4ef0 100644 --- a/src/Java/miscutil/core/block/base/BlockBaseModular.java +++ b/src/Java/miscutil/core/block/base/BlockBaseModular.java @@ -1,9 +1,11 @@ package miscutil.core.block.base; import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -11,13 +13,17 @@ public class BlockBaseModular extends BasicBlock{ protected int blockColour; protected BlockTypes thisBlock; + protected String thisBlockMaterial; - public BlockBaseModular(String unlocalizedName, BlockTypes blockType, int colour) { + public BlockBaseModular(String unlocalizedName, String blockMaterial, BlockTypes blockType, int colour) { super(unlocalizedName, Material.iron); this.setHarvestLevel(blockType.getHarvestTool(), 2); this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture()); this.blockColour = colour; this.thisBlock = blockType; + this.thisBlockMaterial = blockMaterial; + this.setBlockName(getLocalizedName()); + LanguageRegistry.addName(this, getLocalizedName()); } /** @@ -27,12 +33,25 @@ public class BlockBaseModular extends BasicBlock{ @SideOnly(Side.CLIENT) public int getRenderBlockPass() { - if (thisBlock.name() == BlockTypes.FRAME.name()){ + if (thisBlock == BlockTypes.FRAME){ return 1; } return 0; } + @Override + public String getLocalizedName() { + String tempIngot = getUnlocalizedName().replace("tile.blockGtFrame", ""); + if (thisBlock == BlockTypes.FRAME){ + tempIngot = thisBlockMaterial + " Frame Box"; + } + else { + + tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot"); + } + return tempIngot; + } + @Override public boolean isOpaqueCube() { @@ -47,7 +66,26 @@ public class BlockBaseModular extends BasicBlock{ } @Override - public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){ + public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){ + + if (this.blockColour == 0){ + return Utils.generateSingularRandomHexValue(); + } + + return this.blockColour; + } + + @Override + public int getRenderColor(int aMeta) { + if (this.blockColour == 0){ + return Utils.generateSingularRandomHexValue(); + } + + return this.blockColour; + } + + @Override + public int getBlockColor() { return this.blockColour; } diff --git a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java index ae398e130e..4790394675 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java @@ -2,6 +2,7 @@ package miscutil.core.common.compat; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.item.ModItems; +import miscutil.core.lib.CORE.configSwitches; import miscutil.core.recipe.RECIPES_Tools; import miscutil.core.util.item.UtilsItems; import miscutil.core.util.recipe.UtilsRecipe; @@ -12,19 +13,21 @@ public class COMPAT_ExtraUtils { public static void OreDict(){ RECIPES_Tools.RECIPE_DivisionSigil = new ItemStack(UtilsItems.getItem("ExtraUtilities:divisionSigil")); run(); - + } - + private static final void run(){ UtilsItems.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0); GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium)); - - //Division Sigil - UtilsRecipe.recipeBuilder( - "plateNetherStar", "gemIridium", "plateNetherStar", - "plateIridium", RECIPES_Tools.craftingToolHardHammer, "plateIridium", - "plateNetherStar", "gemIridium", "plateNetherStar", - RECIPES_Tools.RECIPE_DivisionSigil); + + if (configSwitches.enableAlternativeDivisionSigilRecipe){ + //Division Sigil + UtilsRecipe.recipeBuilder( + "plateNetherStar", "gemIridium", "plateNetherStar", + "plateIridium", RECIPES_Tools.craftingToolHardHammer, "plateIridium", + "plateNetherStar", "gemIridium", "plateNetherStar", + RECIPES_Tools.RECIPE_DivisionSigil); + } } - + } diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 801bb33b64..f466786055 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -3,14 +3,12 @@ import static miscutil.core.creative.AddToCreativeTab.tabMachines; import static miscutil.core.creative.AddToCreativeTab.tabMisc; import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT; import gregtech.api.util.GT_OreDictUnificator; -import miscutil.core.block.ModBlocks; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.item.base.CoreItem; import miscutil.core.item.base.foods.BaseItemFood; import miscutil.core.item.base.foods.BaseItemHotFood; import miscutil.core.item.base.ingots.BaseItemIngot; import miscutil.core.item.base.ingots.BaseItemIngotHot; -import miscutil.core.item.base.itemblock.ItemBlockGtFrameBox; import miscutil.core.item.base.plates.BaseItemPlate; import miscutil.core.item.effects.RarityUncommon; import miscutil.core.item.general.BufferCore; @@ -315,9 +313,7 @@ public final class ModItems { itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit").setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit"); GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit"); - ItemBlockGtFrameBox = new ItemBlockGtFrameBox(ModBlocks.blockGtFrameSet1); - - itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit").setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit"); - GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit"); + //ItemBlockGtFrameBox = new ItemBlockGtFrameBox(ModBlocks.blockGtFrameSet1); + //GameRegistry.registerItem(ItemBlockGtFrameBox, "itemGtFrameBoxSet1"); } } \ No newline at end of file diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java b/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java index df01123923..ca04497049 100644 --- a/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java +++ b/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java @@ -2,13 +2,13 @@ package miscutil.core.item.base.itemblock; import miscutil.core.creative.AddToCreativeTab; import net.minecraft.block.Block; -import net.minecraft.item.ItemBlockWithMetadata; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class ItemBlockBase extends ItemBlockWithMetadata { +public class ItemBlockBase extends ItemBlock { public ItemBlockBase(Block block) { - super(block, block); + super(block); this.setCreativeTab(AddToCreativeTab.tabBlock); } diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java index ca28daf232..982c5a4b91 100644 --- a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java +++ b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java @@ -1,17 +1,20 @@ package miscutil.core.item.base.itemblock; import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemBlock; -public class ItemBlockGtFrameBox extends ItemBlockBase{ +public class ItemBlockGtFrameBox extends ItemBlock{ + protected int blockColour; + public ItemBlockGtFrameBox(Block block) { super(block); + this.blockColour = block.getBlockColor(); + // this.setCreativeTab(AddToCreativeTab.tabBlock); } - @Override - public int getColorFromItemStack(ItemStack iStack, int colour) { - return super.getColorFromItemStack(iStack, colour); - } + public int getRenderColor(int aMeta) { + return blockColour; + } } diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index c73d94cdef..0b686f6ebf 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -33,7 +33,7 @@ public class CORE { public static IIconRegister GT_BlockIcons, GT_ItemIcons; public static List GT_BlockIconload = new ArrayList(); public static final Class TAB = AddToCreativeTab.class; - public static Configuration Config; + public static Configuration Config; public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus "+EnumChatFormatting.GRAY+"- "+EnumChatFormatting.RED+"[GT++]"; /** @@ -80,7 +80,8 @@ public class CORE { public static boolean enableSolarGenerators = false; public static boolean enableAlternativeBatteryAlloy = false; public static boolean enableThaumcraftShardUnification = false; - public static boolean disableIC2Recipes = false; + public static boolean disableIC2Recipes = false; + public static boolean enableAlternativeDivisionSigilRecipe = false; } -- cgit