diff options
Diffstat (limited to 'src/Java')
6 files changed, 101 insertions, 12 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index c55aa85819..c1e4ac9bbd 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -223,6 +223,8 @@ public final class ModItems { public static Item itemDebugAreaClear; public static Item itemGemShards; + + public static Item itemHalfCompleteCasings; @@ -289,7 +291,8 @@ public final class ModItems { itemBlueprintBase = new ItemBlueprint("itemBlueprint"); itemGemShards = new ItemGemShards("itemGemShards", "Gem Shards", AddToCreativeTab.tabMisc, 32, 0, "They glitter in the light", EnumRarity.rare, EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(182, 114, 18)).setTextureName(CORE.MODID + ":itemHeliumBlob"); - + itemHalfCompleteCasings = new ItemHalfCompleteCasings("itemHalfCompleteCasings", "Half Complete Casing", AddToCreativeTab.tabMisc, 32, 0, "This isn't quite finished yet.", EnumRarity.common, EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(255, 255, 255)).setTextureName("gregtech" + ":" + "gt.metaitem.01" + "761"); + //Start meta Item Generation ItemsFoods.load(); diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java b/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java new file mode 100644 index 0000000000..7d4471d0c5 --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java @@ -0,0 +1,75 @@ +package gtPlusPlus.core.item.general; + +import java.util.List; + +import gtPlusPlus.core.item.base.BaseItemColourable; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.math.MathUtils; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; + +public class ItemHalfCompleteCasings extends BaseItemColourable{ + + public ItemHalfCompleteCasings(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, + String description, EnumRarity regRarity, EnumChatFormatting colour, boolean Effect, int rgb) { + super(unlocalizedName, creativeTab, stackSize, maxDmg, description, regRarity, colour, Effect, rgb); + } + + public ItemHalfCompleteCasings(String unlocalizedName, String displayName, CreativeTabs creativeTab, int stackSize, + int maxDmg, String description, EnumRarity regRarity, EnumChatFormatting colour, boolean Effect, int rgb) { + super(unlocalizedName, displayName, creativeTab, stackSize, maxDmg, description, regRarity, colour, Effect, rgb); + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i < 4; i ++) { + list.add(new ItemStack(item, 1, i)); + } + } + + @Override + public String getItemStackDisplayName(final ItemStack tItem) { + String prefix = " Half Complete Casing "; + String casingType = ""; + if (tItem.getItemDamage() == 0){ + casingType = "I"; + } + else if (tItem.getItemDamage() == 1){ + casingType = "II"; + } + else if (tItem.getItemDamage() == 2){ + casingType = "III"; + } + else if (tItem.getItemDamage() == 3){ + casingType = "IV"; + } + return (prefix+casingType); + + } + + @Override + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + if (this.getDamage(stack)==0){ + return Utils.rgbtoHexValue(150, 150, 220); + } + else if (this.getDamage(stack)==1){ + return Utils.rgbtoHexValue(175, 182, 75); + } + else if (this.getDamage(stack)==2){ + return Utils.rgbtoHexValue(182, 77, 177); + } + else { + return Utils.rgbtoHexValue(77, 175, 182); + } + } + + + + + +} diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 76fc874b9b..b974a3f9d5 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -420,9 +420,14 @@ public class RECIPES_GREGTECH { } private static void assemblerRecipes(){ - //GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6L), ItemList.Casing_Turbine.get(1L, new Object[0]), ItemList.Casing_Turbine2.get(1L, new Object[0]), 50, 16); - //GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6L), ItemList.Casing_Turbine.get(1L, new Object[0]), ItemList.Casing_Turbine3.get(1L, new Object[0]), 50, 16); - + //ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1) + addAR(ItemUtils.getItemStackOfAmountFromOreDict("cellVanadium", 32), ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 32), ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 2), 16, 64); + addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 4), ItemUtils.getItemStackOfAmountFromOreDict("frameGtVanadiumSteel", 8), ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 2, 8), 32, 64); + addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 2, 1), ItemUtils.getItemStackOfAmountFromOreDict("cellNitrogen", 1), ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 64); + } + + private static boolean addAR(ItemStack inputA, ItemStack inputB, ItemStack outputA, int seconds, int voltage){ + return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, seconds*20, voltage); } private static void distilleryRecipes(){ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 3b9e39208d..eb109ff10b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -160,9 +160,9 @@ public enum GregtechItemList implements GregtechItemContainer { Casing_Sifter, Casing_SifterGrate, - //Unknown - Casing_PlaceHolder7, - Casing_PlaceHolder8, + //Power Substation + Casing_Vanadium_Redox, + Casing_Power_SubStation, //Cyclotron Casing_Cyclotron_Coil, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java index a6f03800bf..1aa745295a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java @@ -26,7 +26,7 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Placeholder Casing"); //IS A PLACEHOLDER DO NOT CHANGE GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Industrial Sieve Casing"); //78 GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Large Sieve Grate"); //79 - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Radox Power Cell"); //80 + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell"); //80 GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Sub-Station External Casing"); //81 GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Cyclotron Coil"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Cyclotron Outer Casing"); @@ -42,8 +42,8 @@ extends GregtechMetaCasingBlocksAbstract { GregtechItemList.Casing_PlaceHolder4.set(new ItemStack(this, 1, 4)); GregtechItemList.Casing_Sifter.set(new ItemStack(this, 1, 5)); GregtechItemList.Casing_SifterGrate.set(new ItemStack(this, 1, 6)); - GregtechItemList.Casing_PlaceHolder7.set(new ItemStack(this, 1, 7)); - GregtechItemList.Casing_PlaceHolder8.set(new ItemStack(this, 1, 8)); + GregtechItemList.Casing_Vanadium_Redox.set(new ItemStack(this, 1, 7)); + GregtechItemList.Casing_Power_SubStation.set(new ItemStack(this, 1, 8)); GregtechItemList.Casing_Cyclotron_Coil.set(new ItemStack(this, 1, 9)); GregtechItemList.Casing_Cyclotron_External.set(new ItemStack(this, 1, 10)); GregtechItemList.Casing_ThermalContainment.set(new ItemStack(this, 1, 11)); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java index bf21c330b2..5fe0522b0a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java @@ -41,14 +41,20 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GT_MetaTil "Controller Block for the Power Sub-Station", "Stores quite a lot of power", "Consumes 1% of the average voltage of all energy type hatches", - "Energy consumed goes to cooling the Vanadium Radox power storage", + "Energy consumed goes to cooling the Vanadium Redox power storage", "Size(WxHxD): 5x4x5, Controller (Bottom, Centre)", "--------------------------------------------------------------------------", "Bottom layer is made up of Sub-Station external casings (5x1x5)", - "The inner 3x2x3 area on the next two layers is made up of Vanadium Radox Power Cells", + "The inner 3x2x3 area on the next two layers is made up of Vanadium Redox Power Cells", + "in total, you require 18x VR Power Cells", "A single layer of Sub-Station casings goes around the outside of this 3x2x3", "On top, another layer of Sub-Station casings", "Hatches can be placed nearly anywhere", + "Minimum 1x Energy Input Hatch", + "Minimum 1x Energy Dynamo Hatch", + "1x Input Bus", + "1x Output Bus", + "1x Maintenance hatch", "--------------------------------------------------------------------------", CORE.GT_Tooltip}; } |