diff options
25 files changed, 541 insertions, 112 deletions
diff --git a/build.gradle b/build.gradle index 1d6e397aeb..3920fb8acd 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ sourceCompatibility = 1.7 targetCompatibility = 1.7 archivesBaseName = "GT++" -version = "1.4.3.6-Experimental" +version = "1.4.3.7-Experimental" minecraft.version = "1.7.10-10.13.4.1448-1.7.10" task sourceJar(type: Jar) { diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java index 975a7317ad..392579eb99 100644 --- a/src/Java/miscutil/core/block/ModBlocks.java +++ b/src/Java/miscutil/core/block/ModBlocks.java @@ -1,8 +1,10 @@ package miscutil.core.block; import miscutil.core.block.base.BasicBlock; +import miscutil.core.block.base.BasicBlock.BlockTypes; import miscutil.core.block.general.LightGlass; import miscutil.core.block.general.fluids.FluidRegistryHandler; +import miscutil.core.block.machine.BlockGtFrameBox; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; @@ -19,14 +21,17 @@ public final class ModBlocks { // WIP TODO public static Block blockToolBuilder; public static Block blockGriefSaver; public static Block blockCasingsMisc; - public static Block blockHeliumGenerator; - public static Block blockNHG; - public static Block blockCharger; - - public static Block MatterFabricatorEffectBlock; + public static Block blockHeliumGenerator; + public static Block blockNHG; + public static Block blockCharger; + + public static Block MatterFabricatorEffectBlock; public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels"); public static Block blockFluidJackDaniels; + public static Block blockGtFrameSet1; + public static Block blockGtFrameTantalloy60; + public static Block blockGtFrameTantalloy61; @@ -46,25 +51,31 @@ public final class ModBlocks { //Staballoy Block GameRegistry.registerBlock(blockStaballoy = new BasicBlock("blockStaballoy", Material.iron), "blockStaballoy"); - + //GameRegistry.registerBlock(MatterFabricatorEffectBlock = new MatterFabricatorEffectBlock(), "blockMF_Effect"); - + GameRegistry.registerBlock(MatterFabricatorEffectBlock = new LightGlass(Material.glass, false).setHardness(0.1F).setBlockTextureName(CORE.MODID + ":" + "blockMFEffect").setStepSound(Block.soundTypeGlass), "blockMFEffect"); - + //Casing Blocks blockCasingsMisc = new GregtechMetaCasingBlocks(); //Fluids FluidRegistryHandler.registerFluids(); - - // blockHeliumGenerator = GameRegistry.registerBlock(new HeliumGenerator(), "Helium_Collector"); - // blockNHG = GameRegistry.registerBlock(new Machine_NHG("blockNuclearFueledHeliumGenerator"), "blockNuclearFueledHeliumGenerator"); - // blockCharger = GameRegistry.registerBlock(new Machine_Charger("blockMachineCharger"), "blockMachineCharger"); - + + // blockHeliumGenerator = GameRegistry.registerBlock(new HeliumGenerator(), "Helium_Collector"); + // blockNHG = GameRegistry.registerBlock(new Machine_NHG("blockNuclearFueledHeliumGenerator"), "blockNuclearFueledHeliumGenerator"); + // blockCharger = GameRegistry.registerBlock(new Machine_Charger("blockMachineCharger"), "blockMachineCharger"); + //WIP TODO //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"); + } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/block/base/BasicBlock.java b/src/Java/miscutil/core/block/base/BasicBlock.java index 4e5fd13df8..284342b197 100644 --- a/src/Java/miscutil/core/block/base/BasicBlock.java +++ b/src/Java/miscutil/core/block/base/BasicBlock.java @@ -19,4 +19,33 @@ public class BasicBlock extends Block { this.setStepSound(soundTypeMetal); } + + public static enum BlockTypes { + STANDARD("block", "pickaxe", soundTypeStone), + FRAME("blockGtFrame", "wrench", soundTypeMetal); + + private String TEXTURE_NAME; + private String HARVEST_TOOL; + private SoundType soundOfBlock; + private BlockTypes (String textureName, String harvestTool, SoundType blockSound) + { + this.TEXTURE_NAME = textureName; + this.HARVEST_TOOL = harvestTool; + this.soundOfBlock = blockSound; + } + + public String getTexture() { + return TEXTURE_NAME; + } + + public String getHarvestTool(){ + return HARVEST_TOOL; + } + + public SoundType getBlockSoundType(){ + return soundOfBlock; + } + + } + } diff --git a/src/Java/miscutil/core/block/base/BlockBaseModular.java b/src/Java/miscutil/core/block/base/BlockBaseModular.java new file mode 100644 index 0000000000..f8d965f6d7 --- /dev/null +++ b/src/Java/miscutil/core/block/base/BlockBaseModular.java @@ -0,0 +1,54 @@ +package miscutil.core.block.base; + +import miscutil.core.lib.CORE; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockBaseModular extends BasicBlock{ + + protected int blockColour; + protected BlockTypes thisBlock; + + public BlockBaseModular(String unlocalizedName, 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; + } + + /** + * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha + */ + @Override + @SideOnly(Side.CLIENT) + public int getRenderBlockPass() + { + if (thisBlock.name() == BlockTypes.FRAME.name()){ + return 1; + } + return 0; + } + + @Override + public boolean isOpaqueCube() + { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIcon) + { + this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + thisBlock.getTexture()); + } + + @Override + public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){ + return this.blockColour; + } + +} diff --git a/src/Java/miscutil/core/block/base/MetaBlock.java b/src/Java/miscutil/core/block/base/MetaBlock.java new file mode 100644 index 0000000000..79aeb42afe --- /dev/null +++ b/src/Java/miscutil/core/block/base/MetaBlock.java @@ -0,0 +1,28 @@ +package miscutil.core.block.base; + +import java.util.List; + +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class MetaBlock extends MultiTextureBlock { + + protected MetaBlock(String unlocalizedName, Material material, SoundType soundType) { + super(unlocalizedName, material, soundType); + } + + @Override + public int damageDropped(int meta) { + return meta; + } + + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + for (int i = 0; i < 6; i ++) { + list.add(new ItemStack(item, 1, i)); + } + } + +}
\ No newline at end of file diff --git a/src/Java/miscutil/core/block/base/MultiTextureBlock.java b/src/Java/miscutil/core/block/base/MultiTextureBlock.java new file mode 100644 index 0000000000..033139be89 --- /dev/null +++ b/src/Java/miscutil/core/block/base/MultiTextureBlock.java @@ -0,0 +1,36 @@ +package miscutil.core.block.base; + +import miscutil.core.creative.AddToCreativeTab; +import miscutil.core.lib.CORE; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + +public class MultiTextureBlock extends Block { + + public IIcon[] icons = new IIcon[6]; + + protected MultiTextureBlock(String unlocalizedName, Material material, SoundType blockSound) + { + super(material); + this.setBlockName(unlocalizedName); + this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabBlock); + this.setHardness(2.0F); + this.setResistance(6.0F); + this.setStepSound(blockSound); + } + + @Override + public void registerBlockIcons(IIconRegister reg) { + for (int i = 0; i < 6; i ++) { + this.icons[i] = reg.registerIcon(this.textureName + "_" + i); + } + } + + @Override + public IIcon getIcon(int side, int meta) { + return this.icons[side]; + } +}
\ No newline at end of file diff --git a/src/Java/miscutil/core/block/machine/BlockGtFrameBox.java b/src/Java/miscutil/core/block/machine/BlockGtFrameBox.java new file mode 100644 index 0000000000..9c0f58364d --- /dev/null +++ b/src/Java/miscutil/core/block/machine/BlockGtFrameBox.java @@ -0,0 +1,35 @@ +package miscutil.core.block.machine; + +import miscutil.core.block.base.BasicBlock.BlockTypes; +import miscutil.core.block.base.MetaBlock; +import miscutil.core.lib.CORE; +import net.minecraft.block.material.Material; +import net.minecraft.world.IBlockAccess; + +public class BlockGtFrameBox extends MetaBlock { + + private int[] colours; + private int totalColours; + + public BlockGtFrameBox( + String unlocalizedName, Material material, + BlockTypes blockTypeENUM, boolean recolour, int... colour) { + super(unlocalizedName, material, blockTypeENUM.getBlockSoundType()); + this.setBlockTextureName(CORE.MODID + ":" + "blockGtFrame"); + this.setHarvestLevel(blockTypeENUM.getHarvestTool(), 2); + if (recolour && (colour != null && colour.length > 0)){ + colours = colour; + totalColours = colours.length; + } + } + + @Override + public int colorMultiplier(IBlockAccess p_149720_1_, int p_149720_2_, + int p_149720_3_, int p_149720_4_) { + for (int i : colours){ + + } + return super.colorMultiplier(p_149720_1_, p_149720_2_, p_149720_3_, p_149720_4_); + } + +} diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 231f68edf3..801bb33b64 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -3,12 +3,14 @@ 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; @@ -28,6 +30,7 @@ import miscutil.core.util.debug.DEBUG_INIT; import miscutil.core.util.item.UtilsItems; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemFood; import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.common.registry.GameRegistry; @@ -40,6 +43,11 @@ public final class ModItems { public static Item itemDebugShapeSpawner; public static Item itemBaseSpawnEgg; + + + //Tantaloy60(789, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 213, 231, 237, 0, "Tantaloy 60", 0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Tungsten, 1), new MaterialStack(Tantalum, 9)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))), + //Tantaloy61(790, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 193, 211, 217, 0, "Tantaloy 61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Tungsten, 1), new MaterialStack(Tantalum, 9), new MaterialStack(Titanium, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))), + //EnderIO public static Item itemPlateSoularium; @@ -113,6 +121,16 @@ public final class ModItems { public static BaseItemHotFood itemHotFoodRaisinToast; public static BaseItemFood itemFoodCurriedSausages; public static BaseItemHotFood itemHotFoodCurriedSausages; + + public static Item itemDustTantalloy60; + public static Item itemDustSmallTantalloy60; + public static Item itemDustTinyTantalloy60; + + public static Item itemDustTantalloy61; + public static Item itemDustSmallTantalloy61; + public static Item itemDustTinyTantalloy61; + + public static ItemBlock ItemBlockGtFrameBox; //@SuppressWarnings("unused") @@ -125,9 +143,10 @@ public final class ModItems { DEBUG_INIT.registerItems(); } - ItemsDusts.load(); + ItemsIngots.load(); ItemsPlates.load(); + ItemsDusts.load(); ItemsFoods.load(); //EnderIO Resources @@ -296,8 +315,9 @@ 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"); } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java index e4dab2a72e..bd9853d715 100644 --- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java @@ -1,9 +1,15 @@ package miscutil.core.item.base.dusts; +import static miscutil.core.creative.AddToCreativeTab.tabMisc; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; + import java.util.List; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,6 +21,7 @@ public class BaseItemDust extends Item{ protected int colour; protected String materialName; protected String pileType; + String name = ""; public BaseItemDust(String unlocalizedName, String materialName, int colour, String pileSize) { setUnlocalizedName(unlocalizedName); @@ -25,9 +32,51 @@ public class BaseItemDust extends Item{ else{ this.setTextureName(CORE.MODID + ":" + "dust"+pileSize);} this.setMaxStackSize(64); + this.setCreativeTab(tabMisc); this.colour = colour; this.materialName = materialName; GameRegistry.registerItem(this, unlocalizedName); + + String temp = ""; + Utils.LOG_INFO("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); + if (getUnlocalizedName().contains("item.")){ + temp = getUnlocalizedName().replace("item.", ""); + Utils.LOG_INFO("Generating OreDict Name: "+temp); + } + else { + temp = getUnlocalizedName(); + } + if (temp.contains("DustTiny")){ + temp = temp.replace("itemD", "d"); + Utils.LOG_INFO("Generating OreDict Name: "+temp); + } + else if (temp.contains("DustSmall")){ + temp = temp.replace("itemD", "d"); + Utils.LOG_INFO("Generating OreDict Name: "+temp); + } + else { + temp = temp.replace("itemD", "d"); + Utils.LOG_INFO("Generating OreDict Name: "+temp); + } + if (temp != null && temp != ""){ + GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this)); + } + addMacerationRecipe(); + } + + @Override + public String getItemStackDisplayName(ItemStack iStack) { + + if (getUnlocalizedName().contains("DustTiny")){ + name = "Tiny Pile of "+materialName + " Dust"; + } + else if (getUnlocalizedName().contains("DustSmall")){ + name = "Small Pile of "+materialName + " Dust"; + } + else { + name = materialName + " Dust"; + } + return name; } @Override @@ -56,4 +105,90 @@ public class BaseItemDust extends Item{ } + private void addMixerRecipe(){ + ItemStack tempStack = UtilsItems.getSimpleStack(this); + ItemStack tempOutput = null; + String temp = ""; + Utils.LOG_INFO("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); + if (getUnlocalizedName().contains("item.")){ + temp = getUnlocalizedName().replace("item.", ""); + Utils.LOG_INFO("Generating OreDict Name: "+temp); + } + else { + temp = getUnlocalizedName(); + } + if (temp.contains("DustTiny")){ + temp = temp.replace("itemDustTiny", "dust"); + Utils.LOG_INFO("Generating OreDict Name: "+temp); + } + else if (temp.contains("DustSmall")){ + temp = temp.replace("itemDustSmall", "dust"); + Utils.LOG_INFO("Generating OreDict Name: "+temp); + } + else { + temp = temp.replace("itemD", "d"); + Utils.LOG_INFO("Generating OreDict Name: "+temp); + } + if (temp != null && temp != ""){ + tempOutput = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1); + } + + if (tempOutput != null){ + if (getUnlocalizedName().contains("DustTiny")){ + Utils.LOG_INFO("Generating a 9 Tiny dust to 1 Dust recipe for "+materialName); + UtilsRecipe.addShapelessGregtechRecipe(tempOutput, + tempStack, tempStack, tempStack, + tempStack, tempStack, tempStack, + tempStack, tempStack, tempStack); + } + else if (getUnlocalizedName().contains("DustSmall")){ + Utils.LOG_INFO("Generating a 4 Small dust to 1 Dust recipe for "+materialName); + UtilsRecipe.addShapelessGregtechRecipe(tempOutput, + tempStack, tempStack, null, + tempStack, tempStack, null, + null, null, null); + } + else { + Utils.LOG_INFO("Generating a shapeless Dust recipe for "+materialName); + UtilsRecipe.addShapelessGregtechRecipe(tempOutput, + "dustTungsten", "dustTantalum", "dustTantalum", + "dustTantalum", "dustTantalum", "dustTantalum", + "dustTantalum", "dustTantalum", "dustTantalum"); + } + } + + } + + private void addMacerationRecipe(){ + + String tempIngot = getUnlocalizedName().replace("item.itemDust", "ingot"); + String tempDust = getUnlocalizedName().replace("item.itemDust", "dust"); + ItemStack tempInputStack; + ItemStack tempOutputStack; + + if (getUnlocalizedName().contains("DustSmall") || getUnlocalizedName().contains("DustTiny")){ + return; + } + + Utils.LOG_INFO("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); + if (getUnlocalizedName().contains("item.")){ + tempIngot = getUnlocalizedName().replace("item.", ""); + Utils.LOG_INFO("Generating OreDict Name: "+tempIngot); + } + else { + tempIngot = getUnlocalizedName(); + } + + tempIngot = tempIngot.replace("itemDust", "ingot"); + Utils.LOG_INFO("Generating OreDict Name: "+tempIngot); + + if (tempIngot != null && tempIngot != ""){ + tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); + tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1); + if (null != tempOutputStack && null != tempInputStack){ + GT_ModHandler.addPulverisationRecipe(tempInputStack, tempOutputStack); + } + } + } + } diff --git a/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java b/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java index 1632df582a..7a0e162eec 100644 --- a/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java +++ b/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java @@ -3,7 +3,6 @@ package miscutil.core.item.base.foods; import java.util.List; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsText; import miscutil.core.util.item.UtilsItems; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -59,7 +58,7 @@ public class BaseItemHotFood extends BaseItemFood{ @Override public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { if (materialName != null && materialName != "" && !materialName.equals("")){ - list.add(EnumChatFormatting.GRAY+"Warning: "+UtilsText.red.colour()+"Very hot!"+UtilsText.lightGray.colour()+" Avoid direct handling.."); + list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot!"+EnumChatFormatting.GRAY+" Avoid direct handling.."); list.add(EnumChatFormatting.GRAY+"This food has "+((cooldownTime-(int) stack.getItemDamage())/20)+" seconds left, until it is cool."); } super.addInformation(stack, aPlayer, list, bool); diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java index bdd374d4c7..8a3e8a60b0 100644 --- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java +++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java @@ -58,7 +58,7 @@ public class BaseItemIngot extends Item{ list.add(EnumChatFormatting.GRAY+"A solid ingot of " + materialName + "."); } else if (materialName != null && materialName != "" && !materialName.equals("") && unlocalName.toLowerCase().contains("ingothot")){ - list.add(EnumChatFormatting.GRAY+"Warning: Very hot! Avoid direct handling.."); + list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot! "+EnumChatFormatting.GRAY+" Avoid direct handling.."); } super.addInformation(stack, aPlayer, list, bool); } diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java index 4ec6e9891d..46d9d83dc7 100644 --- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java @@ -6,7 +6,6 @@ import java.util.List; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsText; import miscutil.core.util.item.UtilsItems; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -37,7 +36,7 @@ public class BaseItemIngotHot extends BaseItemIngot{ @Override public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { if (materialName != null && materialName != "" && !materialName.equals("")){ - list.add(EnumChatFormatting.GRAY+"A "+UtilsText.red.colour()+"burning hot"+UtilsText.lightGray.colour()+" ingot of " + materialName + "."); + list.add(EnumChatFormatting.GRAY+"A "+EnumChatFormatting.RED+"burning hot"+EnumChatFormatting.GRAY+" ingot of " + materialName + "."); } super.addInformation(stack, aPlayer, list, bool); } diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java b/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java new file mode 100644 index 0000000000..df01123923 --- /dev/null +++ b/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java @@ -0,0 +1,22 @@ +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.ItemStack; + +public class ItemBlockBase extends ItemBlockWithMetadata { + + public ItemBlockBase(Block block) { + super(block, block); + this.setCreativeTab(AddToCreativeTab.tabBlock); + } + + @Override + public int getColorFromItemStack(ItemStack p_82790_1_, int p_82790_2_) { + + return super.getColorFromItemStack(p_82790_1_, p_82790_2_); + } + + +}
\ No newline at end of file diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java new file mode 100644 index 0000000000..ca28daf232 --- /dev/null +++ b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java @@ -0,0 +1,17 @@ +package miscutil.core.item.base.itemblock; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +public class ItemBlockGtFrameBox extends ItemBlockBase{ + + public ItemBlockGtFrameBox(Block block) { + super(block); + } + + @Override + public int getColorFromItemStack(ItemStack iStack, int colour) { + return super.getColorFromItemStack(iStack, colour); + } + +} diff --git a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java index 07c5a99f11..e38771ee75 100644 --- a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java +++ b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java @@ -67,8 +67,8 @@ public class BaseItemPlate extends Item{ String tempIngot = unlocalName.replace("itemPlate", "ingot"); ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); if (null != tempOutputStack){ - GT_Values.RA.addBenderRecipe(UtilsItems.getSimpleStack(this), - tempOutputStack, + GT_Values.RA.addBenderRecipe(tempOutputStack, + UtilsItems.getSimpleStack(this), 1200, 24); } } diff --git a/src/Java/miscutil/core/item/init/ItemsDusts.java b/src/Java/miscutil/core/item/init/ItemsDusts.java index c33febc244..7e83ca8d01 100644 --- a/src/Java/miscutil/core/item/init/ItemsDusts.java +++ b/src/Java/miscutil/core/item/init/ItemsDusts.java @@ -1,12 +1,8 @@ package miscutil.core.item.init; -import static miscutil.core.creative.AddToCreativeTab.tabMisc; -import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.item.ModItems; import miscutil.core.item.base.dusts.BaseItemDust; -import miscutil.core.lib.CORE; import miscutil.core.util.Utils; -import miscutil.core.util.item.UtilsItems; public class ItemsDusts { @@ -17,20 +13,24 @@ public class ItemsDusts { private static void run(){ //Staballoy Dusts - ModItems.itemDustStaballoy = new BaseItemDust("itemDustStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Dust").setCreativeTab(tabMisc); - GT_OreDictUnificator.registerOre("dustStaballoy", UtilsItems.getItemStack(CORE.MODID+":itemDustStaballoy", 1)); - ModItems.itemDustTinyStaballoy = new BaseItemDust("itemDustTinyStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Tiny").setCreativeTab(tabMisc); - GT_OreDictUnificator.registerOre("dustTinyStaballoy", UtilsItems.getItemStack(CORE.MODID+":itemDustTinyStaballoy", 1)); - ModItems.itemDustSmallStaballoy = new BaseItemDust("itemDustSmallStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Small").setCreativeTab(tabMisc); - GT_OreDictUnificator.registerOre("dustSmallStaballoy", UtilsItems.getItemStack(CORE.MODID+":itemDustSmallStaballoy", 1)); + ModItems.itemDustStaballoy = new BaseItemDust("itemDustStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Dust"); + ModItems.itemDustTinyStaballoy = new BaseItemDust("itemDustTinyStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Tiny"); + ModItems.itemDustSmallStaballoy = new BaseItemDust("itemDustSmallStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Small"); + + //Tantalloy60 Dusts + ModItems.itemDustTantalloy60 = new BaseItemDust("itemDustTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166), "Dust"); + ModItems.itemDustTinyTantalloy60 = new BaseItemDust("itemDustTinyTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166), "Tiny"); + ModItems.itemDustSmallTantalloy60 = new BaseItemDust("itemDustSmallTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166), "Small"); + + //Tantalloy60 Dusts + ModItems.itemDustTantalloy61 = new BaseItemDust("itemDustTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196), "Dust"); + ModItems.itemDustTinyTantalloy61 = new BaseItemDust("itemDustTinyTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196), "Tiny"); + ModItems.itemDustSmallTantalloy61 = new BaseItemDust("itemDustSmallTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196), "Small"); //BloodSteel Dusts - ModItems.itemDustBloodSteel = new BaseItemDust("itemDustBloodSteel", "BloodSteel", Utils.rgbtoHexValue(142, 28, 0), "Dust").setCreativeTab(tabMisc); - GT_OreDictUnificator.registerOre("dustBloodSteel", UtilsItems.getItemStack(CORE.MODID+":itemDustBloodSteel", 1)); - ModItems.itemDustTinyBloodSteel = new BaseItemDust("itemDustTinyBloodSteel", "BloodSteel", Utils.rgbtoHexValue(142, 28, 0), "Tiny").setCreativeTab(tabMisc); - GT_OreDictUnificator.registerOre("dustTinyBloodSteel", UtilsItems.getItemStack(CORE.MODID+":itemDustTinyBloodSteel", 1)); - ModItems.itemDustSmallBloodSteel = new BaseItemDust("itemDustSmallBloodSteel", "BloodSteel", Utils.rgbtoHexValue(142, 28, 0), "Small").setCreativeTab(tabMisc); - GT_OreDictUnificator.registerOre("dustSmallBloodSteel", UtilsItems.getItemStack(CORE.MODID+":itemDustSmallBloodSteel", 1)); + ModItems.itemDustBloodSteel = new BaseItemDust("itemDustBloodSteel", "BloodSteel", Utils.rgbtoHexValue(142, 28, 0), "Dust"); + ModItems.itemDustTinyBloodSteel = new BaseItemDust("itemDustTinyBloodSteel", "BloodSteel", Utils.rgbtoHexValue(142, 28, 0), "Tiny"); + ModItems.itemDustSmallBloodSteel = new BaseItemDust("itemDustSmallBloodSteel", "BloodSteel", Utils.rgbtoHexValue(142, 28, 0), "Small"); } diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index 702e5e00f3..c73d94cdef 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -18,7 +18,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.4.3.5"; + public static final String VERSION = "1.4.3.7"; public static boolean DEBUG = false; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java index e83c680740..0bb7d421a8 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java @@ -156,9 +156,11 @@ public class RECIPES_GREGTECH { Utils.LOG_INFO("Registering Blast Furnace Recipes."); if (!configSwitches.disableStaballoyBlastFurnaceRecipe){ + + //Staballoy GT_Values.RA.addBlastRecipe( - UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 11028, 1), - UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 11098, 1), + UtilsItems.getItemStackOfAmountFromOreDict("ingotUranium", 8), + UtilsItems.getItemStackOfAmountFromOreDict("ingotTitanium", 1), GT_Values.NF, GT_Values.NF, UtilsItems.getSimpleStack(ModItems.itemHotIngotStaballoy, 1), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L), @@ -188,15 +190,81 @@ public class RECIPES_GREGTECH { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L), (int) Math.max(GT_Materials.Staballoy.getMass() / 80L, 1L) * GT_Materials.Staballoy.mBlastFurnaceTemp, 2000, GT_Materials.Staballoy.mBlastFurnaceTemp); + + //Tantalloy 60 + GT_Values.RA.addBlastRecipe( + UtilsItems.getItemStackOfAmountFromOreDict("ingotTungsten", 1), + UtilsItems.getItemStackOfAmountFromOreDict("ingotTantalum", 8), + GT_Values.NF, GT_Values.NF, + UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy60), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tungsten, 1L), + (int) Math.max(GT_Materials.Tantalloy60.getMass() / 80L, 1L) * GT_Materials.Tantalloy60.mBlastFurnaceTemp, + 480, + GT_Materials.Tantalloy60.mBlastFurnaceTemp); + GT_Values.RA.addBlastRecipe( + UtilsItems.getSimpleStack(ModItems.itemDustTantalloy60, 1), + null, + GT_Values.NF, GT_Values.NF, + UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy60, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tungsten, 1L), + (int) Math.max(GT_Materials.Tantalloy60.getMass() / 80L, 1L) * GT_Materials.Tantalloy60.mBlastFurnaceTemp, + 2000, GT_Materials.Tantalloy60.mBlastFurnaceTemp); + GT_Values.RA.addBlastRecipe( + UtilsItems.getSimpleStack(ModItems.itemDustSmallTantalloy60, 4), + null, + GT_Values.NF, GT_Values.NF, + UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy60, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tungsten, 1L), + (int) Math.max(GT_Materials.Tantalloy60.getMass() / 80L, 1L) * GT_Materials.Tantalloy60.mBlastFurnaceTemp, + 2000, GT_Materials.Tantalloy60.mBlastFurnaceTemp); + GT_Values.RA.addBlastRecipe( + UtilsItems.getSimpleStack(ModItems.itemDustTinyTantalloy60, 9), + null, + GT_Values.NF, GT_Values.NF, + UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy60, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tungsten, 1L), + (int) Math.max(GT_Materials.Tantalloy60.getMass() / 80L, 1L) * GT_Materials.Tantalloy60.mBlastFurnaceTemp, + 2000, GT_Materials.Tantalloy60.mBlastFurnaceTemp); + + //Tantalloy 61 + GT_Values.RA.addBlastRecipe( + UtilsItems.getItemStackOfAmountFromOreDict("ingotTitanium", 1), + UtilsItems.getItemStackOfAmountFromOreDict("ingotTantalloy60", 1), + GT_Values.NF, GT_Values.NF, + UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy61), + UtilsItems.getItemStackOfAmountFromOreDict("dustTinyTantalloy60", 1), + (int) Math.max(GT_Materials.Tantalloy61.getMass() / 80L, 1L) * GT_Materials.Tantalloy61.mBlastFurnaceTemp, + 480, + GT_Materials.Tantalloy61.mBlastFurnaceTemp); + GT_Values.RA.addBlastRecipe( + UtilsItems.getSimpleStack(ModItems.itemDustTantalloy61, 1), + null, + GT_Values.NF, GT_Values.NF, + UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy61, 1), + UtilsItems.getItemStackOfAmountFromOreDict("dustTinyTantalloy60", 1), + (int) Math.max(GT_Materials.Tantalloy61.getMass() / 80L, 1L) * GT_Materials.Tantalloy61.mBlastFurnaceTemp, + 2000, GT_Materials.Tantalloy61.mBlastFurnaceTemp); + GT_Values.RA.addBlastRecipe( + UtilsItems.getSimpleStack(ModItems.itemDustSmallTantalloy61, 4), + null, + GT_Values.NF, GT_Values.NF, + UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy61, 1), + UtilsItems.getItemStackOfAmountFromOreDict("dustTinyTantalloy60", 1), + (int) Math.max(GT_Materials.Tantalloy61.getMass() / 80L, 1L) * GT_Materials.Tantalloy61.mBlastFurnaceTemp, + 2000, GT_Materials.Tantalloy61.mBlastFurnaceTemp); + GT_Values.RA.addBlastRecipe( + UtilsItems.getSimpleStack(ModItems.itemDustTinyTantalloy61, 9), + null, + GT_Values.NF, GT_Values.NF, + UtilsItems.getSimpleStack(ModItems.itemHotIngotTantalloy61, 1), + UtilsItems.getItemStackOfAmountFromOreDict("dustTinyTantalloy60", 1), + (int) Math.max(GT_Materials.Tantalloy61.getMass() / 80L, 1L) * GT_Materials.Tantalloy61.mBlastFurnaceTemp, + 2000, GT_Materials.Tantalloy61.mBlastFurnaceTemp); } } private static void vacuumFreezerRecipes(){ - - GT_Values.RA.addVacuumFreezerRecipe( - UtilsItems.getSimpleStack(ModItems.itemHotIngotStaballoy, 1), - UtilsItems.getSimpleStack(ModItems.itemIngotStaballoy, 1), - 2000); + } diff --git a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java index ccd858d673..3de2e5e887 100644 --- a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java +++ b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java @@ -333,43 +333,6 @@ public class UtilsRecipe { return; } - /*if (InputItem1 instanceof String) { - String temp = (String) InputItem1; - InputItem1 = getItemStackFromOreDict(temp); - } - if (InputItem2 instanceof String) { - String temp = (String) InputItem2; - InputItem2 = getItemStackFromOreDict(temp); - } - if (InputItem3 instanceof String) { - String temp = (String) InputItem3; - InputItem3 = getItemStackFromOreDict(temp); - } - if (InputItem4 instanceof String) { - String temp = (String) InputItem4; - InputItem4 = getItemStackFromOreDict(temp); - } - if (InputItem5 instanceof String) { - String temp = (String) InputItem5; - InputItem5 = getItemStackFromOreDict(temp); - } - if (InputItem6 instanceof String) { - String temp = (String) InputItem6; - InputItem6 = getItemStackFromOreDict(temp); - } - if (InputItem7 instanceof String) { - String temp = (String) InputItem7; - InputItem7 = getItemStackFromOreDict(temp); - } - if (InputItem8 instanceof String) { - String temp = (String) InputItem8; - InputItem8 = getItemStackFromOreDict(temp); - } - if (InputItem9 instanceof String) { - String temp = (String) InputItem9; - InputItem9 = getItemStackFromOreDict(temp); - }*/ - GT_ModHandler.addCraftingRecipe(OutputItem, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, @@ -382,7 +345,21 @@ public class UtilsRecipe { 'F', InputItem6, 'G', InputItem7, 'H', InputItem8, - 'I', InputItem9}); + 'I', InputItem9}); + } + + public static void addShapelessGregtechRecipe(ItemStack OutputItem, Object... inputItems){ + + for(Object whatever : inputItems){ + if (!(whatever instanceof ItemStack) && !(whatever instanceof String)){ + Utils.LOG_INFO("One Input item was not an ItemStack of an OreDict String."); + return; + } + } + + GT_ModHandler.addShapelessCraftingRecipe(OutputItem, + GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[]{inputItems}); } public static ItemStack getItemStackFromOreDict(String oredictName){ diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 75f4ecdcbc..ba6ad6ce41 100644 --- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -321,8 +321,8 @@ public enum GregtechOrePrefixes { /* TODO*/ RedstoneAlloy(39, TextureSet.SET_METALLIC, 1.0F, 256, 2, 1|2|16|32|64, 178,34,34, 0, "Redstone Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.Redstone, 4))), //Needs more Use, I think. - Tantaloy60(40, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 213, 231, 237, 0, "Tantaloy 60", 0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))), - Tantaloy61(41, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 193, 211, 217, 0, "Tantaloy 61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))); + Tantalloy60(40, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 213, 231, 237, 0, "Tantalloy 60", 0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))), + Tantalloy61(41, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 193, 211, 217, 0, "Tantalloy 61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))); diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java index 7a252d9bfb..d085d39a50 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java @@ -112,58 +112,58 @@ extends GregtechMeta_MultiBlockBase { return false; }*/ - Utils.LOG_INFO("Centrifuge Debug - 1"); + Utils.LOG_WARNING("Centrifuge Debug - 1"); GT_Recipe.GT_Recipe_Map map = getRecipeMap(); if (map == null) { - Utils.LOG_INFO("Centrifuge Debug - False - No recipe map"); + Utils.LOG_WARNING("Centrifuge Debug - False - No recipe map"); return false; } - Utils.LOG_INFO("Centrifuge Debug - 2"); + Utils.LOG_WARNING("Centrifuge Debug - 2"); ArrayList<ItemStack> tInputList = getStoredInputs(); long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); - Utils.LOG_INFO("Centrifuge Debug - Tier variable: "+tTier); + Utils.LOG_WARNING("Centrifuge Debug - Tier variable: "+tTier); ItemStack[] tInputs = (ItemStack[]) tInputList.toArray(new ItemStack[tInputList.size()]); ArrayList<FluidStack> tFluidList = getStoredFluids(); FluidStack[] tFluids = (FluidStack[]) tFluidList.toArray(new FluidStack[tFluidList.size()]); if (tInputList.size() > 0 || tFluids.length > 0) { GT_Recipe tRecipe = map.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs); if (tRecipe != null) { - Utils.LOG_INFO("Recipe was not invalid"); + Utils.LOG_WARNING("Recipe was not invalid"); mLastRecipe = tRecipe; this.mEUt = 0; this.mOutputItems = null; this.mOutputFluids = null; if (!tRecipe.isRecipeInputEqual(true, tFluids, tInputs)) { - Utils.LOG_INFO("False: 1"); + Utils.LOG_WARNING("False: 1"); return false; } this.mMaxProgresstime = tRecipe.mDuration; this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; - Utils.LOG_INFO("Centrifuge Debug - 2 - Max Progress Time: "+this.mMaxProgresstime); + Utils.LOG_WARNING("Centrifuge Debug - 2 - Max Progress Time: "+this.mMaxProgresstime); if (tRecipe.mEUt <= 16) { - Utils.LOG_INFO("Centrifuge Debug - Using < 16eu/t"); + Utils.LOG_WARNING("Centrifuge Debug - Using < 16eu/t"); this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); this.mMaxProgresstime = (tRecipe.mDuration / (1 << tTier - 1)); - Utils.LOG_INFO("Centrifuge Debug - 3.1 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt + " Obscure GT Value "+gregtech.api.enums.GT_Values.V[(tTier - 1)]); + Utils.LOG_WARNING("Centrifuge Debug - 3.1 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt + " Obscure GT Value "+gregtech.api.enums.GT_Values.V[(tTier - 1)]); } else { - Utils.LOG_INFO("Centrifuge Debug - using > 16eu/t"); + Utils.LOG_WARNING("Centrifuge Debug - using > 16eu/t"); this.mEUt = tRecipe.mEUt; this.mMaxProgresstime = tRecipe.mDuration; - Utils.LOG_INFO("Centrifuge Debug - 3.2 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt + " Obscure GT Value "+gregtech.api.enums.GT_Values.V[(tTier - 1)]); + Utils.LOG_WARNING("Centrifuge Debug - 3.2 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt + " Obscure GT Value "+gregtech.api.enums.GT_Values.V[(tTier - 1)]); while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { this.mEUt *= 4; this.mMaxProgresstime /= 2; - Utils.LOG_INFO("Centrifuge Debug - 4 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt); + Utils.LOG_WARNING("Centrifuge Debug - 4 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt); } } this.mEUt *= 1; if (this.mEUt > 0) { this.mEUt = (-this.mEUt); - Utils.LOG_INFO("Centrifuge Debug - 5 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt); + Utils.LOG_WARNING("Centrifuge Debug - 5 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt); } ItemStack[] tOut = new ItemStack[tRecipe.mOutputs.length]; for (int h = 0; h < tRecipe.mOutputs.length; h++) { @@ -189,7 +189,7 @@ extends GregtechMeta_MultiBlockBase { if (this.mMaxProgresstime <= 0){ this.mMaxProgresstime++; } - Utils.LOG_INFO("Centrifuge Debug - 6 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt); + Utils.LOG_WARNING("Centrifuge Debug - 6 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt); List<ItemStack> overStacks = new ArrayList<ItemStack>(); for (int f = 0; f < tOut.length; f++) { if (tOut[f].getMaxStackSize() < tOut[f].stackSize) { @@ -214,11 +214,11 @@ extends GregtechMeta_MultiBlockBase { this.mOutputItems = tOut; this.mOutputFluids = new FluidStack[]{tFOut}; updateSlots(); - Utils.LOG_INFO("Centrifuge: True"); + Utils.LOG_WARNING("Centrifuge: True"); return true; } } - Utils.LOG_INFO("Centrifuge: Recipe was invalid."); + Utils.LOG_WARNING("Centrifuge: Recipe was invalid."); return false; } @@ -249,7 +249,7 @@ extends GregtechMeta_MultiBlockBase { int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY; int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; - //Utils.LOG_INFO("X:"+xDir+" Y:"+yDir+" Z:"+zDir); + //Utils.LOG_WARNING("X:"+xDir+" Y:"+yDir+" Z:"+zDir); if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) { return false; } @@ -260,14 +260,14 @@ extends GregtechMeta_MultiBlockBase { if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); - //Utils.LOG_INFO("X:"+tTileEntity.getXCoord()+" Y:"+tTileEntity.getYCoord()+" Z:"+tTileEntity.getZCoord()); + //Utils.LOG_WARNING("X:"+tTileEntity.getXCoord()+" Y:"+tTileEntity.getYCoord()+" Z:"+tTileEntity.getZCoord()); if ((!addMaintenanceToMachineList(tTileEntity, 57)) && (!addInputToMachineList(tTileEntity, 57)) && (!addOutputToMachineList(tTileEntity, 57)) && (!addEnergyInputToMachineList(tTileEntity, 57))) { //Maintenance Hatch if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) { if (tTileEntity.getXCoord() == aBaseMetaTileEntity.getXCoord() && tTileEntity.getYCoord() == aBaseMetaTileEntity.getYCoord() && tTileEntity.getZCoord() == (aBaseMetaTileEntity.getZCoord()+2)) { if ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance)) { - Utils.LOG_INFO("MAINT HATCH IN CORRECT PLACE"); + Utils.LOG_WARNING("MAINT HATCH IN CORRECT PLACE"); this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntity.getMetaTileEntity()); ((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock = getCasingTextureIndex(); } else { @@ -275,7 +275,7 @@ extends GregtechMeta_MultiBlockBase { } } else { - Utils.LOG_INFO("MAINT HATCH IN WRONG PLACE"); + Utils.LOG_WARNING("MAINT HATCH IN WRONG PLACE"); } } diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java index 5becb4c59b..d206156da0 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java @@ -14,7 +14,6 @@ import java.util.Arrays; import miscutil.core.block.ModBlocks; import miscutil.core.lib.CORE; -import miscutil.core.util.Utils; import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine; import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import miscutil.core.xmod.gregtech.api.util.GregtechRecipe; @@ -141,11 +140,11 @@ public class GregtechMetaTileEntityIndustrialCokeOven this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)}; this.mOutputFluids = new FluidStack[]{tRecipe.getFluidOutput(0)}; updateSlots(); - Utils.LOG_INFO("Coke oven: True"); + //Utils.LOG_INFO("Coke oven: True"); return true; } } - Utils.LOG_INFO("Coke oven: False"); + //Utils.LOG_INFO("Coke oven: False"); return false; } /*public boolean checkRecipe(ItemStack aStack) { diff --git a/src/resources/assets/miscutils/textures/blocks/blockGtFrame.png b/src/resources/assets/miscutils/textures/blocks/blockGtFrame.png Binary files differnew file mode 100644 index 0000000000..d93c52c24c --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/blockGtFrame.png diff --git a/src/resources/assets/miscutils/textures/items/itemGear.png b/src/resources/assets/miscutils/textures/items/itemGear.png Binary files differnew file mode 100644 index 0000000000..6d0cf3be50 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/itemGear.png diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 1579e36589..90b10c2483 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)", "credits": "", "logoFile": "", - "version": "1.4.3.5", + "version": "1.4.3.7", "mcversion": "1.7.10", "url": "https://github.com/draknyte1/MiscUtilities/wiki", "updateUrl": "https://github.com/draknyte1/MiscUtilities/tree/master/build/libs", |
