diff options
Diffstat (limited to 'main/java/gregtech/common')
13 files changed, 68 insertions, 4 deletions
diff --git a/main/java/gregtech/common/GT_RecipeAdder.java b/main/java/gregtech/common/GT_RecipeAdder.java index 719d517b6c..bb9a173288 100644 --- a/main/java/gregtech/common/GT_RecipeAdder.java +++ b/main/java/gregtech/common/GT_RecipeAdder.java @@ -445,6 +445,13 @@ public class GT_RecipeAdder if ((aMold == null) || (aInput == null) || (aOutput == null)) { return false; } + if(aInput.isFluidEqual(Materials.PhasedGold.getMolten(144))){ + aInput = Materials.VibrantAlloy.getMolten(aInput.amount); + } + if(aInput.isFluidEqual(Materials.PhasedIron.getMolten(144))){ + aInput = Materials.PulsatingIron.getMolten(aInput.amount); + } + if ((aDuration = GregTech_API.sRecipeFile.get("fluidsolidifier", aOutput, aDuration)) <= 0) { return false; } @@ -457,6 +464,12 @@ public class GT_RecipeAdder if ((aInput == null) || (aOutput == null)) { return false; } + if(aOutput.isFluidEqual(Materials.PhasedGold.getMolten(1))){ + aOutput = Materials.VibrantAlloy.getMolten(aOutput.amount); + } + if(aOutput.isFluidEqual(Materials.PhasedIron.getMolten(1))){ + aOutput = Materials.PulsatingIron.getMolten(aOutput.amount); + } if ((aDuration = GregTech_API.sRecipeFile.get("fluidsmelter", aInput, aDuration)) <= 0) { return false; } @@ -469,9 +482,16 @@ public class GT_RecipeAdder if ((aInput == null) || (aOutput == null)) { return false; } + if(aOutput.isFluidEqual(Materials.PhasedGold.getMolten(1))){ + aOutput = Materials.VibrantAlloy.getMolten(aOutput.amount); + } + if(aOutput.isFluidEqual(Materials.PhasedIron.getMolten(1))){ + aOutput = Materials.PulsatingIron.getMolten(aOutput.amount); + } if ((aDuration = GregTech_API.sRecipeFile.get("fluidextractor", aInput, aDuration)) <= 0) { return false; } + GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes.addRecipe(true, new ItemStack[] { aInput }, new ItemStack[] { aRemains }, null, new int[] { aChance }, null, new FluidStack[] { aOutput }, aDuration, aEUt, 0); return true; } diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index d2ecf40a57..ae30b44a9a 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -9,6 +9,7 @@ import gregtech.api.enums.Dyes; import gregtech.api.enums.Textures; import gregtech.api.gui.GT_Container_MultiMachine; import gregtech.api.gui.GT_GUIContainer_MultiMachine; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -222,7 +223,7 @@ public abstract class GT_MetaTileEntity_FusionComputer { ITexture[] sTexture; if(aSide==aFacing){ - sTexture = new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)),new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SCREEN) }; + sTexture = new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)),new GT_RenderedTexture(getIconOverlay()) }; }else{ if(!aActive){ sTexture = new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa))};}else{ @@ -231,6 +232,8 @@ public abstract class GT_MetaTileEntity_FusionComputer } return sTexture; } + + public abstract IIconContainer getIconOverlay(); @Override public boolean isCorrectMachinePart(ItemStack aStack) {return true;} diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java index b99a6678b5..3c23afcbb5 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java @@ -1,6 +1,8 @@ package gregtech.common.tileentities.machines.multi; import gregtech.api.GregTech_API; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import net.minecraft.block.Block; @@ -43,4 +45,9 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC return GregTech_API.sBlockCasings1; } + @Override + public IIconContainer getIconOverlay() { + return Textures.BlockIcons.OVERLAY_FUSION1; + } + } diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java index 0f7fab7bd8..d101875ba2 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java @@ -1,6 +1,8 @@ package gregtech.common.tileentities.machines.multi; import gregtech.api.GregTech_API; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import net.minecraft.block.Block; @@ -43,4 +45,8 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC return GregTech_API.sBlockCasings4; } + @Override + public IIconContainer getIconOverlay() { + return Textures.BlockIcons.OVERLAY_FUSION2; + } } diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java index 42371fbe82..b7334bd449 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java @@ -1,6 +1,8 @@ package gregtech.common.tileentities.machines.multi; import gregtech.api.GregTech_API; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import net.minecraft.block.Block; @@ -43,5 +45,10 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC return GregTech_API.sBlockCasings4; } + @Override + public IIconContainer getIconOverlay() { + return Textures.BlockIcons.OVERLAY_FUSION3; + } + } diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index 8096f48329..61ff12fcff 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -110,6 +110,8 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl return GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes; }else if(tmp.startsWith("bender")){ return GT_Recipe.GT_Recipe_Map.sBenderRecipes; + }else if(tmp.startsWith("wiremill")){ + return GT_Recipe.GT_Recipe_Map.sWiremillRecipes; } return null; } diff --git a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java index be75334a3e..08428153aa 100644 --- a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java +++ b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java @@ -226,7 +226,8 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity,byte aSide, byte aFacing, byte aColorIndex, boolean aActive,boolean aRedstone) { - return aSide == aBaseMetaTileEntity.getFrontFacing() ? new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SCREEN)} :new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]};//aSide != aFacing ? mMachineBlock != 0 ? new ITexture[] {Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]} : new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]} : mMachineBlock != 0 ? aActive ? getTexturesActive(Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]) : getTexturesInactive(Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]) : aActive ? getTexturesActive(Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]) : getTexturesInactive(Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]); + if(aBaseMetaTileEntity.getFrontFacing()==0&&aSide==4){return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_QCHEST)}; } + return aSide == aBaseMetaTileEntity.getFrontFacing() ? new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_QCHEST)} :new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]};//aSide != aFacing ? mMachineBlock != 0 ? new ITexture[] {Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]} : new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]} : mMachineBlock != 0 ? aActive ? getTexturesActive(Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]) : getTexturesInactive(Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]) : aActive ? getTexturesActive(Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]) : getTexturesInactive(Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]); } @Override diff --git a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java index c7e855eb66..a27feb5814 100644 --- a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java +++ b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java @@ -28,7 +28,7 @@ public class GT_MetaTileEntity_QuantumTank @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return aSide ==1 ? new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SCREEN)} :new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]}; + return aSide ==1 ? new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_QTANK)} :new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]}; } @Override diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine.java b/main/java/gregtech/common/tools/GT_Tool_Turbine.java index 89df4bfc85..7640c4fe8a 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine.java @@ -13,13 +13,14 @@ import net.minecraft.util.IChatComponent; public abstract class GT_Tool_Turbine extends GT_Tool{ public abstract float getBaseDamage(); @Override public boolean isMinableBlock(Block aBlock, byte aMetaData) {return false;} - @Override public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? Textures.ItemIcons.TURBINE : null;} + @Override public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? getTurbineIcon(): null;} @Override public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null;} public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " put " + EnumChatFormatting.RED + aEntity.getCommandSenderName()+"s" + EnumChatFormatting.WHITE + " head into a turbine"); } + public abstract IIconContainer getTurbineIcon(); public abstract float getSpeedMultiplier(); public abstract float getMaxDurabilityMultiplier(); public ItemStack getBrokenItem(ItemStack aStack){return null;} diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java index 0bf3b783a5..f2ec5a737f 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java @@ -1,7 +1,11 @@ package gregtech.common.tools; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; + public class GT_Tool_Turbine_Huge extends GT_Tool_Turbine { @Override public float getSpeedMultiplier() {return 4.0F;} @Override public float getMaxDurabilityMultiplier() {return 4.0F;} @Override public float getBaseDamage() {return 3.0F;} + @Override public IIconContainer getTurbineIcon() {return Textures.ItemIcons.TURBINE_HUGE;} } diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java index 57947aea7a..ed0713cd7b 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java @@ -1,7 +1,11 @@ package gregtech.common.tools; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; + public class GT_Tool_Turbine_Large extends GT_Tool_Turbine { @Override public float getSpeedMultiplier() {return 3.0F;} @Override public float getMaxDurabilityMultiplier() {return 3.0F;} @Override public float getBaseDamage() {return 5.0F;} + @Override public IIconContainer getTurbineIcon() {return Textures.ItemIcons.TURBINE_LARGE;} } diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java index 8327a74332..a29ad632d6 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java @@ -1,7 +1,11 @@ package gregtech.common.tools; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; + public class GT_Tool_Turbine_Normal extends GT_Tool_Turbine { @Override public float getSpeedMultiplier() {return 2.0F;} @Override public float getMaxDurabilityMultiplier() {return 2.0F;} @Override public float getBaseDamage() {return 2.5F;} + @Override public IIconContainer getTurbineIcon() {return Textures.ItemIcons.TURBINE;} } diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java index fb93a2b290..4292ab73fb 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java @@ -1,7 +1,12 @@ package gregtech.common.tools; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; + public class GT_Tool_Turbine_Small extends GT_Tool_Turbine { @Override public float getSpeedMultiplier() {return 1.0F;} @Override public float getMaxDurabilityMultiplier() {return 1.0F;} @Override public float getBaseDamage() {return 0.0F;} + @Override public IIconContainer getTurbineIcon() {return Textures.ItemIcons.TURBINE_SMALL;} + } |