From 75d5897f4db4e97feca4fe4d978cc5823cbbb150 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 17:00:15 +1000 Subject: % Initial Commit --- src/Java/gregtech/api/util/Recipe_GT.java | 6 +- src/Java/gtPlusPlus/GTplusplus.java | 42 ++-- src/Java/gtPlusPlus/core/commands/CommandMath.java | 13 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 1 - .../general/rfchargingpack/ChargingPackBase.java | 84 +++++++ src/Java/gtPlusPlus/core/material/Material.java | 110 +++++----- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 36 ++- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 48 +++- src/Java/gtPlusPlus/core/recipe/common/CI.java | 1 - .../core/util/minecraft/MaterialUtils.java | 32 +-- .../GT_MetaTileEntity_ULV_CombustionGenerator.java | 27 +-- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 22 +- .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 28 +-- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 5 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 4 +- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 242 +++++++++++++++++++++ .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 75 +++++++ .../GregtechMetaTileEntity_Adv_Implosion.java | 123 +++++++++++ .../production/GregtechMetaTileEntityTreeFarm.java | 1 + ...chMetaTileEntity_PowerSubStationController.java | 2 +- .../registration/gregtech/GregtechGeneratorsULV | 15 ++ 21 files changed, 752 insertions(+), 165 deletions(-) create mode 100644 src/Java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java create mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java create mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java create mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java create mode 100644 src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV (limited to 'src/Java') diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java index eb8d8f546f..c9d3194aad 100644 --- a/src/Java/gregtech/api/util/Recipe_GT.java +++ b/src/Java/gregtech/api/util/Recipe_GT.java @@ -984,7 +984,8 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ if (mColumn >= 3) { mColumn = 0; mRow++; - } + } + if (mColumn <= 2 && mRow <= 3) outputStacks.add( (PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack( (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow])); @@ -1148,7 +1149,8 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ if (mColumn >= 3) { mColumn = 0; mRow++; - } + } + if (mColumn <= 2 && mRow <= 3) outputStacks.add( (PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack( (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow])); diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 0aadef5e4b..a8c880c660 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -101,7 +101,7 @@ public class GTplusplus implements ActionListener { CORE.USER_COUNTRY = GeoUtils.determineUsersCountry(); // Handle GT++ Config - ConfigHandler.handleConfigFile(event); + ConfigHandler.handleConfigFile(event); //Check for Dev CORE.DEVENV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); @@ -146,8 +146,8 @@ public class GTplusplus implements ActionListener { proxy.postInit(event); BookHandler.runLater(); Core_Manager.postInit(); - RecipeGen_Recycling.executeGenerators(); - + RecipeGen_Recycling.executeGenerators(); + Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); Logger.INFO("| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess + " | Failed: " + RegistrationHandler.recipesFailed + " |"); @@ -162,9 +162,9 @@ public class GTplusplus implements ActionListener { @EventHandler public void serverStarting(final FMLServerStartingEvent event) { - - if (CORE.DEVENV) - event.registerServerCommand(new CommandMath()); + + if (CORE.DEVENV) + event.registerServerCommand(new CommandMath()); //Chunk Loading Timer h = ChunkManager.createChunkQueue(); @@ -194,15 +194,15 @@ public class GTplusplus implements ActionListener { public void actionPerformed(final ActionEvent arg0) { } - - + + /** * This {@link EventHandler} is called after the {@link FMLPostInitializationEvent} stages of all loaded mods executes successfully. * {@link #onLoadComplete(FMLLoadCompleteEvent)} exists to inject recipe generation after Gregtech and all other mods are entirely loaded and initialized. * @param event - The {@link EventHandler} object passed through from FML to {@link #GTplusplus()}'s {@link #instance}. */ @Mod.EventHandler - public void onLoadComplete(FMLLoadCompleteEvent event) { + public void onLoadComplete(FMLLoadCompleteEvent event) { RecipeGen_BlastSmelterGT_GTNH.generateGTNHBlastSmelterRecipesFromEBFList(); FishPondFakeRecipe.generateFishPondRecipes(); @@ -219,14 +219,14 @@ public class GTplusplus implements ActionListener { CORE.RA.addMultiblockElectrolyzerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mDuration, x.mEUt); } } - + //Advanced Vacuum Freezer generation for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList) { - if (x != null && RecipeUtils.doesGregtechRecipeHaveEqualCells(x)) { + if (x != null && RecipeUtils.doesGregtechRecipeHaveEqualCells(x)) { CORE.RA.addAdvancedFreezerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, (x.mDuration/2), x.mEUt); } } - + } protected void dumpGtRecipeMap(final GT_Recipe_Map r) { @@ -249,11 +249,11 @@ public class GTplusplus implements ActionListener { SegmentAnalytics.isEnabled = CORE.ConfigSwitches.enableUpdateChecker; if (!Utils.isServer() && PlayerUtils.isPlayerAlkalus()){ SegmentAnalytics.isEnabled = true; - } + } new SegmentHelper(); } - private static final boolean setupMaterialBlacklist(){ + private static final boolean setupMaterialBlacklist(){ int ID = 0; Material.invalidMaterials.put(ID++, Materials._NULL); Material.invalidMaterials.put(ID++, Materials.Clay); @@ -262,9 +262,9 @@ public class GTplusplus implements ActionListener { Material.invalidMaterials.put(ID++, Materials.Bronze); Material.invalidMaterials.put(ID++, Materials.Hydrogen); //Infused TC stuff - Material.invalidMaterials.put(ID++, Materials.InfusedAir); - Material.invalidMaterials.put(ID++, Materials.InfusedEarth); - Material.invalidMaterials.put(ID++, Materials.InfusedFire); + Material.invalidMaterials.put(ID++, Materials.InfusedAir); + Material.invalidMaterials.put(ID++, Materials.InfusedEarth); + Material.invalidMaterials.put(ID++, Materials.InfusedFire); Material.invalidMaterials.put(ID++, Materials.InfusedWater); //EIO Materials @@ -290,10 +290,10 @@ public class GTplusplus implements ActionListener { //Non GTNH Materials if (!CORE.GTNH){ //Mithril - Random Dungeon Loot - mGregMatLoader.enableMaterial(Materials.Mithril); - } + mGregMatLoader.enableMaterial(Materials.Mithril); + } //Force - Alloying - mGregMatLoader.enableMaterial(Materials.Force); + mGregMatLoader.enableMaterial(Materials.Force); } -} \ No newline at end of file +} diff --git a/src/Java/gtPlusPlus/core/commands/CommandMath.java b/src/Java/gtPlusPlus/core/commands/CommandMath.java index 6ab0b2cbc6..9c51aa7a9b 100644 --- a/src/Java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/Java/gtPlusPlus/core/commands/CommandMath.java @@ -56,7 +56,7 @@ public class CommandMath implements ICommand final World W = S.getEntityWorld(); final EntityPlayer P = CommandUtils.getPlayer(S); if (!W.isRemote && P != null){ - if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1")) { + if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1")) { String[] prefixes = new String[] { "ingot", "plate", @@ -83,8 +83,8 @@ public class CommandMath implements ICommand "Silver", "Lead", "Aluminium" - }; - AutoMap itemEntities = new AutoMap(); + }; + AutoMap itemEntities = new AutoMap(); for (String g : prefixes) { for (String s : loots) { itemEntities.put(new EntityItem(W, P.posX, P.posY, P.posZ, ItemUtils.getItemStackOfAmountFromOreDictNoBroken(g+s, 64))); @@ -92,7 +92,7 @@ public class CommandMath implements ICommand for (EntityItem e : itemEntities.values()) { e.lifespan = 30000; } - + } } @@ -195,7 +195,7 @@ public class CommandMath implements ICommand public boolean canCommandSenderUseCommand(final ICommandSender var1){ final EntityPlayer P = CommandUtils.getPlayer(var1); if (P == null){ - return false; + return false; } if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1")) { return true; @@ -220,4 +220,5 @@ public class CommandMath implements ICommand return true; } -} \ No newline at end of file +} + diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index d34e1a1856..2c09ba1f03 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -58,7 +58,6 @@ public class COMPAT_HANDLER { new RECIPES_LaserEngraver(); new RECIPES_Extruder(); - GregtechGeneratorsULV.run(); GregtechEnergyBuffer.run(); GregtechLFTR.run(); GregtechSteamCondenser.run(); diff --git a/src/Java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java b/src/Java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java new file mode 100644 index 0000000000..d4d3a07e6f --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java @@ -0,0 +1,84 @@ +package gtPlusPlus.core.item.general.rfchargingpack; + +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; + +import cofh.energy.ItemEnergyContainer; +import gtPlusPlus.core.util.math.MathUtils; + +public class ChargingPackBase extends ItemEnergyContainer { + + protected final int mCapacityMax; + protected final byte mTier; + + public ChargingPackBase(byte tier) { + this(tier, (tier == 1 ? 4000000 : tier == 2 ? 8000000 : tier == 3 ? 16000000 : tier == 4 ? 32000000 : 64000000)); + } + + private ChargingPackBase(byte tier, int maxStorage) { + super(maxStorage); + mTier = tier; + mCapacityMax = maxStorage; + } + + public int getMaxEnergyInput(ItemStack container) + { + return this.maxReceive; + } + + public int getMaxEnergyExtracted(ItemStack container) + { + return this.maxExtract; + } + + @Override + public void onUpdate(ItemStack aStack, World aWorld, Entity aEnt, int p_77663_4_, boolean p_77663_5_) { + super.onUpdate(aStack, aWorld, aEnt, p_77663_4_, p_77663_5_); + + ItemEnergyContainer current = this; + int currentStored = 0; + if (current != null) { + currentStored = current.getEnergyStored(aStack); + } + if (currentStored > 0) { + if (aEnt instanceof EntityPlayer) { + if (((EntityPlayer) aEnt).inventory != null) { + for (ItemStack invStack : ((EntityPlayer) aEnt).inventory.mainInventory) { + if (invStack != null) { + if (invStack.getItem() instanceof ItemEnergyContainer) { + if (current != null) { + currentStored = current.getEnergyStored(aStack); + if (currentStored > 0) { + int mTransLimit; + int mMaxStorage; + int mCurrent; + mTransLimit = getMaxEnergyInput(invStack); + mMaxStorage = current.getMaxEnergyStored(invStack); + mCurrent = current.getEnergyStored(invStack); + if (mCurrent+mTransLimit <= mMaxStorage) { + current.extractEnergy(aStack, current.receiveEnergy(invStack, mTransLimit, false), false); + } + } + } + } + } + } + } + } + } + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { + list.add(EnumChatFormatting.RED+"RF Information"); + list.add(EnumChatFormatting.GRAY+"Extraction Rate: [" +EnumChatFormatting.RED+ this.maxExtract + EnumChatFormatting.GRAY + "Rf/t]" + " Insert Rate: [" +EnumChatFormatting.RED+ this.maxReceive+EnumChatFormatting.GRAY+"Rf/t]"); + list.add(EnumChatFormatting.GRAY+"Current Charge: ["+EnumChatFormatting.RED+this.getEnergyStored(stack) + EnumChatFormatting.GRAY + "Rf / " + this.getMaxEnergyStored(stack)+"Rf] "+EnumChatFormatting.RED+MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack))+EnumChatFormatting.GRAY+"%"); + super.addInformation(stack, p_77624_2_, list, p_77624_4_); + } + +} diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 1b2ef19b53..fe8b638d5b 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -76,7 +76,7 @@ public class Material { public Material(String materialName, MaterialState defaultState, short[] rgba, int radiationLevel, MaterialStack[] materialStacks) { this(materialName, defaultState, null, 0, rgba, -1, -1, -1, -1, false, "", radiationLevel, false, materialStacks); - } + } public Material(String materialName, MaterialState defaultState, short[] rgba, int j, int k, int l, int m, int radiationLevel, MaterialStack[] materialStacks){ this(materialName, defaultState, null, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks); @@ -104,7 +104,7 @@ public class Material { public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){ this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, inputs); - } + } public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean addCells,final MaterialStack... inputs) { this (materialName, defaultState, null, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, addCells, true, inputs); @@ -113,7 +113,7 @@ public class Material { public Material(final String materialName, final MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){ this (materialName, defaultState, null, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, true, true, inputs); } - + public Material(final String materialName, final MaterialState defaultState, final TextureSet set, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean generateCells, final MaterialStack... inputs){ this (materialName, defaultState, null, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, true, true, inputs); } @@ -289,33 +289,33 @@ public class Material { this.vChemicalFormula = "??"; } - if (generateFluid){ - final Materials isValid = Materials.get(this.getLocalizedName()); - if (FluidUtils.getFluidStack(localizedName, 1) != null){ - this.vMoltenFluid = FluidUtils.getFluidStack(localizedName, 1).getFluid(); + if (generateFluid){ + final Materials isValid = Materials.get(this.getLocalizedName()); + if (FluidUtils.getFluidStack(localizedName, 1) != null){ + this.vMoltenFluid = FluidUtils.getFluidStack(localizedName, 1).getFluid(); + } + else if (isValid == null || isValid == Materials._NULL){ + this.vMoltenFluid = this.generateFluid(); + } + else { + if (isValid.mFluid != null){ + this.vMoltenFluid = isValid.mFluid; } - else if (isValid == null || isValid == Materials._NULL){ - this.vMoltenFluid = this.generateFluid(); + else if (isValid.mGas != null){ + this.vMoltenFluid = isValid.mGas; } else { - if (isValid.mFluid != null){ - this.vMoltenFluid = isValid.mFluid; - } - else if (isValid.mGas != null){ - this.vMoltenFluid = isValid.mGas; - } - else { - this.vMoltenFluid = this.generateFluid(); - } + this.vMoltenFluid = this.generateFluid(); } - - this.vPlasma = this.generatePlasma(); - } - else { - this.vMoltenFluid = null; - this.vPlasma = null; } + this.vPlasma = this.generatePlasma(); + } + else { + this.vMoltenFluid = null; + this.vPlasma = null; + } + String ratio = ""; if (this.vSmallestRatio != null) { for (int hu=0;hu sets = new AutoMap(); - if (this.vMaterialInput != null) { + if (this.vMaterialInput != null) { for (MaterialStack r : this.vMaterialInput) { if (r.getStackMaterial().getTextureSet().mSetName.toLowerCase().contains("fluid")) { sets.put(ELEMENT.getInstance().GOLD); @@ -362,16 +362,16 @@ public class Material { else { sets.put(r.getStackMaterial()); } - } - TextureSet mostUsedTypeTextureSet = (TextureSet) MaterialUtils.getMostCommonTextureSet(new ArrayList(sets.values())); + } + TextureSet mostUsedTypeTextureSet = (TextureSet) MaterialUtils.getMostCommonTextureSet(new ArrayList(sets.values())); if (mostUsedTypeTextureSet != null && mostUsedTypeTextureSet instanceof TextureSet) { Logger.MATERIALS("Set textureset for "+this.localizedName+" to be "+mostUsedTypeTextureSet.mSetName+"."); return mostUsedTypeTextureSet; - } + } } } Logger.MATERIALS("Set textureset for "+this.localizedName+" to be "+Materials.Iron.mIconSet.mSetName+". [Fallback]"); - return Materials.Iron.mIconSet; + return Materials.Iron.mIconSet; } public final String getLocalizedName(){ @@ -402,7 +402,7 @@ public class Material { final public short[] getRGBA(){ if (this.RGBA != null) { if (this.RGBA.length == 4){ - return this.RGBA; + return this.RGBA; } else { return new short[]{this.RGBA[0], this.RGBA[1], this.RGBA[2], 0}; @@ -570,17 +570,17 @@ public class Material { } public final ItemStack getCrushedCentrifuged(final int stacksize){ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("crushedCentrifuged"+this.unlocalizedName, stacksize); - } + } public final ItemStack getDustPurified(final int stacksize){ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPure"+this.unlocalizedName, stacksize); } public final ItemStack getDustImpure(final int stacksize){ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustImpure"+this.unlocalizedName, stacksize); - } + } public final boolean hasSolidForm() { if (this.getDust(1) != null || this.getBlock(1) != null || this.getSmallDust(1) != null || this.getTinyDust(1) != null) { return true; - } + } return false; } @@ -605,7 +605,7 @@ public class Material { Logger.INFO("Failed setting slot "+i+", using "+this.localizedName); } } - return temp; + return temp; } return new ItemStack[]{}; } @@ -781,8 +781,8 @@ public class Material { if (a5 != null){ Logger.INFO("Using a pre-defined Fluid from GT. Plasma."); return a5.getFluid(); - } - Logger.INFO("Using null."); + } + Logger.INFO("Using null."); return null; } } @@ -791,37 +791,37 @@ public class Material { if (this.materialState == MaterialState.SOLID){ if (isValid.mFluid != null){ Logger.INFO("Using a pre-defined Fluid from GT. mFluid."); - return isValid.mFluid; - } + return isValid.mFluid; + } else if (isValid.mStandardMoltenFluid != null){ Logger.INFO("Using a pre-defined Fluid from GT. mStandardMoltenFluid."); - return isValid.mStandardMoltenFluid; + return isValid.mStandardMoltenFluid; } } else if (this.materialState == MaterialState.GAS){ if (isValid.mGas != null){ Logger.INFO("Using a pre-defined Fluid from GT. mGas."); - return isValid.mGas; - } + return isValid.mGas; + } } else if (this.materialState == MaterialState.LIQUID || this.materialState == MaterialState.PURE_LIQUID){ if (isValid.mFluid != null){ Logger.INFO("Using a pre-defined Fluid from GT. mFluid."); - return isValid.mFluid; - } + return isValid.mFluid; + } else if (isValid.mGas != null){ Logger.INFO("Using a pre-defined Fluid from GT. mGas."); - return isValid.mGas; + return isValid.mGas; } else if (isValid.mStandardMoltenFluid != null){ Logger.INFO("Using a pre-defined Fluid from GT. mStandardMoltenFluid."); - return isValid.mStandardMoltenFluid; + return isValid.mStandardMoltenFluid; } - } + } Logger.INFO("Generating our own fluid."); //Generate a Cell if we need to - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){ + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){ if (this.vGenerateCells){ new BaseItemCell(this); Logger.INFO("Generated a cell for "+this.getUnlocalizedName()); @@ -873,7 +873,7 @@ public class Material { if (this.materialState == MaterialState.ORE){ return null; } - final Materials isValid = Materials.get(this.getLocalizedName()); + final Materials isValid = Materials.get(this.getLocalizedName()); if (!this.vGenerateCells){ return null; @@ -885,8 +885,8 @@ public class Material { } if (isValid.mPlasma != null){ Logger.INFO("Using a pre-defined Plasma from GT."); - return isValid.mPlasma; - } + return isValid.mPlasma; + } Logger.INFO("Generating our own Plasma."); return FluidUtils.addGTPlasma(this); @@ -894,10 +894,10 @@ public class Material { - final public FluidStack getFluid(final int fluidAmount) { + final public FluidStack getFluid(final int fluidAmount) { if (this.vMoltenFluid == null){ return null; - } + } final FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount); return moltenFluid; } @@ -987,4 +987,4 @@ public class Material { } } -} \ No newline at end of file +} diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index ba7e3246e6..bc3e67623d 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -961,11 +961,41 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("molten.tantalum", 144 * 4), ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 8), 32, 120); addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1), - ItemUtils.getItemStackOfAmountFromOreDict("plateLead", 4), FluidUtils.getFluidStack("nitrogen", 1000), + ItemUtils.getItemStackOfAmountFromOreDict("plateLead", 4), FluidUtils.getFluidStack("oxygen", 1000), ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 240); - addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), + + //Tier 2-6 + ItemStack T1 = GregtechItemList.Casing_Vanadium_Redox.get(1); + ItemStack T2 = GregtechItemList.Casing_Vanadium_Redox_IV.get(1); + ItemStack T3 = GregtechItemList.Casing_Vanadium_Redox_LuV.get(1); + ItemStack T4 = GregtechItemList.Casing_Vanadium_Redox_ZPM.get(1); + ItemStack T5 = GregtechItemList.Casing_Vanadium_Redox_UV.get(1); + ItemStack T6 = GregtechItemList.Casing_Vanadium_Redox_MAX.get(1); + + addAR(T1, + ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 4), + FluidUtils.getFluidStack("nitrogen", 2000), + T2, 128, 2000); + addAR(T2, + ItemUtils.getItemStackOfAmountFromOreDict("plateTitanium", 4), + FluidUtils.getFluidStack("helium", 2000), + T3, 256, 8000); + addAR(T3, + ItemUtils.getItemStackOfAmountFromOreDict("plateTungsten", 4), + FluidUtils.getFluidStack("argon", 4000), + T4, 512, 32000); + addAR(T4, + ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 4), + FluidUtils.getFluidStack("radon", 4000), + T5, 1024, 128000); + addAR(T5, + ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 4), + FluidUtils.getFluidStack("krypton", 500), + T6, 2048, 512000); + + /*addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, - GregtechItemList.Casing_Power_SubStation.get(4), 80, 120); + GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);*/ } private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final ItemStack outputA, diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 34653bf772..55b7793f93 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -141,7 +141,7 @@ public class RECIPES_Machines { public static String pipeTier10 = "pipeHuge"+"HastelloyX"; public static String pipeTier11 = "pipeHuge"+"Europium"; - //IV MACHINES + // EV/IV MACHINES public static ItemStack EV_MACHINE_Electrolyzer; public static ItemStack EV_MACHINE_Centrifuge; public static ItemStack EV_MACHINE_BendingMachine; @@ -151,6 +151,10 @@ public class RECIPES_Machines { public static ItemStack EV_MACHINE_Cutter; public static ItemStack EV_MACHINE_MassFabricator; public static ItemStack EV_MACHINE_Extruder; + public static ItemStack EV_MACHINE_Sifter; + public static ItemStack EV_MACHINE_ThermalCentrifuge; + public static ItemStack EV_MACHINE_OreWasher; + public static ItemStack EV_MACHINE_AlloySmelter; //Cables @@ -215,6 +219,8 @@ public class RECIPES_Machines { boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1); //IV MACHINES + + if (!CORE.GTNH){ EV_MACHINE_Electrolyzer = ItemList.Machine_EV_Electrolyzer.get(1); EV_MACHINE_BendingMachine= ItemList.Machine_EV_Bender.get(1); EV_MACHINE_Wiremill= ItemList.Machine_EV_Wiremill.get(1); @@ -224,6 +230,28 @@ public class RECIPES_Machines { EV_MACHINE_Centrifuge= ItemList.Machine_EV_Centrifuge.get(1); EV_MACHINE_Cutter = ItemList.Machine_EV_Cutter.get(1); EV_MACHINE_Extruder = ItemList.Machine_EV_Extruder.get(1); + EV_MACHINE_Sifter = ItemList.Machine_EV_Sifter.get(1); + EV_MACHINE_ThermalCentrifuge = ItemList.Machine_EV_ThermalCentrifuge.get(1); + EV_MACHINE_OreWasher = ItemList.Machine_EV_OreWasher.get(1); + EV_MACHINE_AlloySmelter = ItemList.Machine_EV_AlloySmelter.get(1); + } + //Balance or some shit + else { + EV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1); + EV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1); + EV_MACHINE_Wiremill= ItemList.Machine_IV_Wiremill.get(1); + HV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1); + EV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1); + EV_MACHINE_MassFabricator= ItemList.Machine_LuV_Massfab.get(1); + EV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1); + EV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1); + EV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1); + EV_MACHINE_Sifter = ItemList.Machine_IV_Sifter.get(1); + EV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1); + EV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1); + EV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1); + } + } @@ -277,7 +305,7 @@ public class RECIPES_Machines { //Buffer Core RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[1], cableTier1, CI.component_Plate[1], - CI.circuitPrimitive, IC2MFE, CI.circuitPrimitive, + CI.circuitPrimitive, "plateStaballloy", CI.circuitPrimitive, CI.component_Plate[1], cableTier1, CI.component_Plate[1], RECIPE_BufferCore_ULV); RecipeUtils.addShapedGregtechRecipe( @@ -701,7 +729,7 @@ public class RECIPES_Machines { //Blast Smelter RecipeUtils.addShapedGregtechRecipe( "plateZirconiumCarbide", CI.circuitTier4, "plateZirconiumCarbide", - cableTier4, CI.machineCasing_EV, cableTier4, + cableTier4, EV_MACHINE_AlloySmelter, cableTier4, "plateZirconiumCarbide", CI.circuitTier3, "plateZirconiumCarbide", RECIPE_IndustrialBlastSmelterController); //Blast Smelter Frame Casing @@ -753,7 +781,7 @@ public class RECIPES_Machines { //Industrial Sieve RecipeUtils.addShapedGregtechRecipe( "plateEglinSteel", CI.circuitTier2, "plateEglinSteel", - cableTier3, CI.machineCasing_MV, cableTier3, + cableTier3, EV_MACHINE_Sifter, cableTier3, "plateEglinSteel", CI.circuitTier2, "plateEglinSteel", RECIPE_IndustrialSieveController); //Industrial Sieve Casing @@ -1061,15 +1089,15 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation){ RecipeUtils.recipeBuilder( - null, "plateIncoloy020", null, + "screwTitanium", "plateIncoloy020", "screwTitanium", "plateIncoloy020", "frameGtIncoloyMA956", "plateIncoloy020", - null, "plateIncoloy020", null, + "screwTitanium", "plateIncoloy020", "screwTitanium", GregtechItemList.Casing_Power_SubStation.get(Casing_Amount)); - ItemStack mBattery = (!CORE.GTNH ? ItemList.Energy_LapotronicOrb2.get(1) : ItemList.ZPM2.get(1)); + ItemStack mBattery = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR); RecipeUtils.recipeBuilder( - "plateIncoloyMA956", GregtechItemList.Battery_RE_EV_Lithium.get(1), "plateIncoloyMA956", + "plateIncoloyMA956", mBattery, "plateIncoloyMA956", GregtechItemList.Casing_Power_SubStation.get(1), GregtechItemList.Casing_Vanadium_Redox.get(1), GregtechItemList.Casing_Power_SubStation.get(1), "plateIncoloy020", "plateIncoloyMA956", "plateIncoloy020", GregtechItemList.PowerSubStation.get(1)); @@ -1084,7 +1112,7 @@ public class RECIPES_Machines { RecipeUtils.recipeBuilder( "plateRedSteel","circuitData","plateRedSteel", - "stickTalonite",GregtechItemList.Casing_ThermalCentrifuge.get(1),"stickTalonite", + "stickTalonite",EV_MACHINE_ThermalCentrifuge,"stickTalonite", "plateRedSteel","gearGtTalonite","plateRedSteel", GregtechItemList.Industrial_ThermalCentrifuge.get(1)); } @@ -1098,7 +1126,7 @@ public class RECIPES_Machines { RecipeUtils.recipeBuilder( "plateGrisium",CI.electricPump_MV,"plateGrisium", - "plateTalonite",GregtechItemList.Casing_WashPlant.get(1),"plateTalonite", + "plateTalonite",EV_MACHINE_OreWasher,"plateTalonite", "plateGrisium","circuitData","plateGrisium", GregtechItemList.Industrial_WashPlant.get(1)); } diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index c6dd1bfeb5..44db9cf284 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -1,6 +1,5 @@ package gtPlusPlus.core.recipe.common; -import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 98b02078c6..e9d68ea864 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -27,11 +27,11 @@ public class MaterialUtils { @SuppressWarnings({ "rawtypes", "unused" }) private static Class[][] commonTypes = - {{Materials.class, int.class, TextureSet.class, float.class, int.class, - int.class, int.class, int.class, int.class, int.class, int.class, - String.class, int.class, int.class, int.class, int.class, boolean.class, - boolean.class, int.class, int.class, int.class, Dyes.class, int.class, - List.class , List.class}}; +{{Materials.class, int.class, TextureSet.class, float.class, int.class, + int.class, int.class, int.class, int.class, int.class, int.class, + String.class, int.class, int.class, int.class, int.class, boolean.class, + boolean.class, int.class, int.class, int.class, Dyes.class, int.class, + List.class , List.class}}; public static List oreDictValuesForEntry(final String oredictName){ List oredictItemNames; @@ -47,7 +47,7 @@ public class MaterialUtils { public static Material generateMaterialFromGtENUM(final Materials material){ return generateMaterialFromGtENUM(material, null); } - + public static Material generateMaterialFromGtENUM(final Materials material, short[] customRGB){ @SuppressWarnings("deprecation") String name = material.name(); @@ -68,12 +68,12 @@ public class MaterialUtils { if (material.isRadioactive()){ radioactivity = 1; } - + //Weird Blacklist of Bad Chemical Strings if (material.mElement == Element.Pb || material.mElement == Element.Na || material.mElement == Element.Ar){ chemicalFormula = StringUtils.subscript(Utils.sanitizeString(material.mElement.name())); } - + //Determine default state Logger.MATERIALS("[Debug] Setting State of GT generated material. "+material.mDefaultLocalName); if (material.getMolten(1) != null || material.getSolid(1) != null){ @@ -140,10 +140,10 @@ public class MaterialUtils { return temp; } - public static boolean hasValidRGBA(final short[] rgba){ + public static boolean hasValidRGBA(final short[] rgba){ if (rgba == null || rgba.length < 3 || rgba.length > 4){ return false; - } + } return true; } @@ -184,9 +184,9 @@ public class MaterialUtils { } public static Materials getMaterialByName(String materialName) { - + if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - return (Materials) EnumUtils.getValue(gregtech.api.enums.Materials.class, materialName, false); + return (Materials) EnumUtils.getValue(gregtech.api.enums.Materials.class, materialName, false); } else { for (Materials m : Materials.values()) { @@ -197,7 +197,7 @@ public class MaterialUtils { return null; } } - + @SuppressWarnings("deprecation") public static String getMaterialName(Materials mat){ String mName; @@ -212,12 +212,14 @@ public class MaterialUtils { } return mName; } - + public static TextureSet getMostCommonTextureSet(List list) { Optional r = list.stream().map(Material::getTextureSet).collect(Collectors.groupingBy(Function.identity(), Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey); TextureSet o = (r != null && r.isPresent() && r.get() != null) ? r.get() : null; return o; + } + + } -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java index c5397b83db..63cf78e8bc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java @@ -13,30 +13,25 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_DieselGenerator; import net.minecraft.item.ItemStack; -public class GT_MetaTileEntity_ULV_CombustionGenerator extends GT_MetaTileEntity_DieselGenerator { - public GT_MetaTileEntity_ULV_CombustionGenerator(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier); - } - - public GT_MetaTileEntity_ULV_CombustionGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } +public class GT_MetaTileEntity_ULV_CombustionGenerator + extends GT_MetaTileEntity_DieselGenerator { - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ULV_CombustionGenerator(this.mName, this.mTier, this.mDescription, this.mTextures); - } - @Override public int getCapacity() { return 16000; } - @Override public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier." + this.mTier, 95); + this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier." + this.mTier, (100 - 1 * 5)); + } + + public int getEfficiency() { + return this.mEfficiency; + } + + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_ULV_CombustionGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java index fe550895a3..1efb0b8ca6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java @@ -9,28 +9,24 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_GasTurbine; -public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbine { - public GT_MetaTileEntity_ULV_GasTurbine(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier); - } - - public GT_MetaTileEntity_ULV_GasTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } +public class GT_MetaTileEntity_ULV_GasTurbine + extends GT_MetaTileEntity_GasTurbine { public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ULV_GasTurbine(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_ULV_GasTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } - @Override public int getCapacity() { return 16000; } - @Override public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, 95); + this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, (100 - 1 * 5)); + } + + public int getEfficiency() { + return this.mEfficiency; } + } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java index f4d7a33689..cc4c7cce3c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java @@ -10,30 +10,24 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenera import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_SteamTurbine; import net.minecraftforge.fluids.FluidStack; public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamTurbine { - public GT_MetaTileEntity_ULV_SteamTurbine(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier); - } - - public GT_MetaTileEntity_ULV_SteamTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); + + public int getCapacity() { + return 12000; } - - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ULV_SteamTurbine(this.mName, this.mTier, this.mDescription, this.mTextures); + public void onConfigLoad() { + this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SteamTurbine.efficiency.tier." + this.mTier, 6 + 1); } - @Override - public int getCapacity() { - return 16000; + public int getEfficiency() { + return this.mEfficiency; } - @Override - public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SteamTurbine.efficiency.tier." + this.mTier, 6 + 1); + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_ULV_SteamTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } -} + +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index 86dd454545..46e6069db3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -261,7 +261,8 @@ extends GregtechMeta_MultiBlockBase { // Time to Defer to Special Handling if it's in replicator mode. if (tCircuitID == MODE_REPLICATOR) { - return checkReplicatorRecipe(aItemInputs, aFluidInputs, aMaxParallelRecipes, aEUPercent, aSpeedBonusPercent, aOutputChanceRoll); + return false; + // return checkReplicatorRecipe(aItemInputs, aFluidInputs, aMaxParallelRecipes, aEUPercent, aSpeedBonusPercent, aOutputChanceRoll); } // Reset outputs and progress stats @@ -813,7 +814,7 @@ extends GregtechMeta_MultiBlockBase { @Override public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (mInternalMode < 1) { + if (mInternalMode < 2) { mInternalMode++; } else { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java index 4bfc6681b9..a2d71c2c15 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java @@ -26,7 +26,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta public static int CASING_TEXTURE_ID; public static String mCryoFuelName = "Gelid Cryotheum"; - public static String mCasingName = "Advanced Crygenic Casing"; + public static String mCasingName = "Advanced Cryogenic Casing"; public GregtechMetaTileEntity_IndustrialVacuumFreezer(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); @@ -134,7 +134,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta } public int getPollutionPerTick(final ItemStack aStack) { - return 400; + return 50; } public int getDamageToComponent(final ItemStack aStack) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java new file mode 100644 index 0000000000..3cf13cff9b --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -0,0 +1,242 @@ +package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced; + +import gregtech.api.GregTech_API; +import gregtech.api.enums.Materials; +import gregtech.api.enums.Textures; +import gregtech.api.gui.GT_GUIContainer_MultiMachine; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; + +import java.util.ArrayList; + +public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase { + + + public static int CASING_TEXTURE_ID; + public static String mHotFuelName = "Blazing Pyrotheum"; + public static String mCasingName = "Advanced Blast Furnace Casing"; + + private int mHeatingCapacity = 0; + private int controllerY; + private FluidStack[] pollutionFluidStacks = new FluidStack[]{Materials.CarbonDioxide.getGas(1000), + Materials.CarbonMonoxide.getGas(1000), Materials.SulfurDioxide.getGas(1000)}; + + public GregtechMetaTileEntity_Adv_EBF(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional); + CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10); + mHotFuelName = FluidUtils.getFluidStack("pyrotheum", 1).getLocalizedName(); + mCasingName = GregtechItemList.Casing_AdvancedVacuum.get(1).getDisplayName(); + } + + public GregtechMetaTileEntity_Adv_EBF(String aName) { + super(aName); + CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10); + mHotFuelName = FluidUtils.getFluidStack("pyrotheum", 1).getLocalizedName(); + mCasingName = GregtechItemList.Casing_AdvancedVacuum.get(1).getDisplayName(); + } + + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GregtechMetaTileEntity_Adv_EBF(this.mName); + } + + public String[] getDescription() { + return new String[]{ + "Controller Block for the Advanced Electric Blast Furnace", + "Consumes 1L of "+mHotFuelName+"/t during operation", + "Size(WxHxD): 3x4x3 (Hollow), Controller (Front middle bottom)", + "16x Heating Coils (Two middle Layers, hollow)", + "1x Input Hatch/Bus (Any bottom layer casing)", + "1x Output Hatch/Bus (Any bottom layer casing)", + "1x Energy Hatch (Any bottom layer casing)", + "1x Maintenance Hatch (Any bottom layer casing)", + "1x Muffler Hatch (Top middle)", + "1x Output Hatch to recover CO2/CO/SO2 (optional, any top layer casing),", + " Recovery scales with Muffler Hatch tier", + mCasingName+"s for the rest", + "Each 900K over the min. Heat Capacity grants 5% speedup (multiplicatively)", + "Each 1800K over the min. Heat Capacity allows for one upgraded overclock", + "Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%", + "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"}; + } + + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { + if (aSide == aFacing) { + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[11], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)}; + } + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[11]}; + } + + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "ElectricBlastFurnace.png"); + } + + public GT_Recipe.GT_Recipe_Map getRecipeMap() { + return GT_Recipe.GT_Recipe_Map.sBlastRecipes; + } + + public boolean isCorrectMachinePart(ItemStack aStack) { + return true; + } + + public boolean isFacingValid(byte aFacing) { + return aFacing > 1; + } + + public boolean checkRecipe(ItemStack aStack) { + return checkRecipeGeneric(4, 100, 100); //Will have to clone the logic from parent class to handle heating coil tiers. + } + + public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { + controllerY = aBaseMetaTileEntity.getYCoord(); + int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; + int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; + + this.mHeatingCapacity = 0; + if (!aBaseMetaTileEntity.getAirOffset(xDir, 1, zDir)) { + return false; + } + if (!aBaseMetaTileEntity.getAirOffset(xDir, 2, zDir)) { + return false; + } + if (!addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 3, zDir), 11)) { + return false; + } + byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 2, zDir); + switch (tUsedMeta) { + case 0: + this.mHeatingCapacity = 1800; + break; + case 1: + this.mHeatingCapacity = 2700; + break; + case 2: + this.mHeatingCapacity = 3600; + break; + case 3: + this.mHeatingCapacity = 4500; + break; + case 4: + this.mHeatingCapacity = 5400; + break; + case 5: + this.mHeatingCapacity = 7200; + break; + case 6: + this.mHeatingCapacity = 9001; + break; + default: + return false; + } + for (int i = -1; i < 2; i++) { + for (int j = -1; j < 2; j++) { + if ((i != 0) || (j != 0)) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings5) { + return false; + } + if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 2, zDir + j) != tUsedMeta) { + return false; + } + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5) { + return false; + } + if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { + return false; + } + if (!addOutputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 3, zDir + j), 11)) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 3, zDir + j) != GregTech_API.sBlockCasings1) { + return false; + } + if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 3, zDir + j) != 11) { + return false; + } + } + } + } + } + for (int i = -1; i < 2; i++) { + for (int j = -1; j < 2; j++) { + if ((xDir + i != 0) || (zDir + j != 0)) { + IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 0, zDir + j); + if ((!addMaintenanceToMachineList(tTileEntity, 11)) && (!addInputToMachineList(tTileEntity, 11)) && (!addOutputToMachineList(tTileEntity, 11)) && (!addEnergyInputToMachineList(tTileEntity, 11))) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j) != GregTech_API.sBlockCasings1) { + return false; + } + if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 0, zDir + j) != 11) { + return false; + } + } + } + } + } + return true; + } + + public int getMaxEfficiency(ItemStack aStack) { + return 10000; + } + + public int getPollutionPerTick(ItemStack aStack) { + return 50; + } + + public int getDamageToComponent(ItemStack aStack) { + return 0; + } + + public boolean explodesOnComponentBreak(ItemStack aStack) { + return false; + } + + @Override + public boolean addOutput(FluidStack aLiquid) { + if (aLiquid == null) return false; + int targetHeight; + FluidStack tLiquid = aLiquid.copy(); + boolean isOutputPollution = false; + for (FluidStack pollutionFluidStack : pollutionFluidStacks) { + if (tLiquid.isFluidEqual(pollutionFluidStack)) { + isOutputPollution = true; + break; + } + } + if (isOutputPollution) { + targetHeight = this.controllerY + 3; + int pollutionReduction = 0; + for (GT_MetaTileEntity_Hatch_Muffler tHatch : mMufflerHatches) { + if (isValidMetaTileEntity(tHatch)) { + pollutionReduction = 100 - tHatch.calculatePollutionReduction(100); + break; + } + } + tLiquid.amount = tLiquid.amount * (pollutionReduction + 5) / 100; + } else { + targetHeight = this.controllerY; + } + for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) { + if (isValidMetaTileEntity(tHatch) && GT_ModHandler.isSteam(aLiquid) ? tHatch.outputsSteam() : tHatch.outputsLiquids()) { + if (tHatch.getBaseMetaTileEntity().getYCoord() == targetHeight) { + int tAmount = tHatch.fill(tLiquid, false); + if (tAmount >= tLiquid.amount) { + return tHatch.fill(tLiquid, true) >= tLiquid.amount; + } else if (tAmount > 0) { + tLiquid.amount = tLiquid.amount - tHatch.fill(tLiquid, true); + } + } + } + } + return false; + } + +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java new file mode 100644 index 0000000000..dbce76938b --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java @@ -0,0 +1,75 @@ +package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced; + +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; + +public class GregtechMetaTileEntity_Advanced_Fusion_MK4 extends GT_MetaTileEntity_FusionComputer { + + public GregtechMetaTileEntity_Advanced_Fusion_MK4(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional, 6); + } + + public GregtechMetaTileEntity_Advanced_Fusion_MK4(String aName) { + super(aName); + } + + @Override + public int tier() { + return 9; + } + + @Override + public long maxEUStore() { + return 640010000L * (Math.min(16, this.mEnergyHatches.size())) / 8L; + } + + @Override + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GregtechMetaTileEntity_Advanced_Fusion_MK4(mName); + } + + @Override + public int getCasingMeta() { + return 8; + } + + @Override + public Block getFusionCoil() { + return GregTech_API.sBlockCasings4; + } + + @Override + public int getFusionCoilMeta() { + return 7; + } + + public String[] getDescription() { + return new String[]{ + "HARNESSING THE POWER OF A NEUTRON STAR", + "Fusion Machine Casings MK III around Advanced Fusion Coil Blocks", + "2-16 Input Hatches", + "1-16 Output Hatches", + "1-16 Energy Hatches", + "All Hatches must be UV or better", + "32768 EU/t and 80mio EU Cap per Energy Hatch"}; + } + + @Override + public int tierOverclock() { + return 6; + } + + @Override + public Block getCasing() { + return GregTech_API.sBlockCasings4; + } + + @Override + public IIconContainer getIconOverlay() { + return Textures.BlockIcons.OVERLAY_FUSION3; + } +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java new file mode 100644 index 0000000000..b63ad8d6de --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java @@ -0,0 +1,123 @@ +package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced; + +import gregtech.api.GregTech_API; +import gregtech.api.enums.Textures; +import gregtech.api.gui.GT_GUIContainer_MultiMachine; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import net.minecraft.block.Block; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.ArrayList; + +public class GregtechMetaTileEntity_Adv_Implosion + extends GregtechMeta_MultiBlockBase { + public GregtechMetaTileEntity_Adv_Implosion(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional); + } + + public GregtechMetaTileEntity_Adv_Implosion(String aName) { + super(aName); + } + + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GregtechMetaTileEntity_Adv_Implosion(this.mName); + } + + public String[] getDescription() { + return new String[]{ + "Controller Block for the Advanced Implosion Compressor", + "Size(WxHxD): 3x3x3 (Hollow), Controller (Front centered)", + "1x Input Bus (Any casing)", + "1x Output Bus (Any casing)", + "1x Maintenance Hatch (Any casing)", + "1x Muffler Hatch (Any casing)", + "1x Energy Hatch (Any casing)", + "Solid Steel Machine Casings for the rest (16 at least!)", + "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"}; + } + + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { + if (aSide == aFacing) { + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[16], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_IMPLOSION_COMPRESSOR)}; + } + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[16]}; + } + + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "ImplosionCompressor.png"); + } + + public GT_Recipe.GT_Recipe_Map getRecipeMap() { + return GT_Recipe.GT_Recipe_Map.sImplosionRecipes; + } + + public boolean isCorrectMachinePart(ItemStack aStack) { + return true; + } + + public boolean isFacingValid(byte aFacing) { + return aFacing > 1; + } + + public boolean checkRecipe(final ItemStack aStack) { + return checkRecipeGeneric((GT_Utility.getTier(this.getMaxInputVoltage())/2+1), 100, 100); + } + + public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) { + super.startSoundLoop(aIndex, aX, aY, aZ); + if (aIndex == 20) { + GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(5)), 10, 1.0F, aX, aY, aZ); + } + } + + public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { + int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; + int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; + if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) { + return false; + } + int tAmount = 0; + for (int i = -1; i < 2; i++) { + for (int j = -1; j < 2; j++) { + for (int h = -1; h < 2; h++) { + if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { + IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); + if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addMufflerToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16)) && (!addOutputToMachineList(tTileEntity, 16)) && (!addEnergyInputToMachineList(tTileEntity, 16))) { + Block tBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j); + byte tMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j); + if (((tBlock != GregTech_API.sBlockCasings2) || (tMeta != 0)) && ((tBlock != GregTech_API.sBlockCasings3) || (tMeta != 4))) { + return false; + } + tAmount++; + } + } + } + } + } + return tAmount >= 16; + } + + public int getMaxEfficiency(ItemStack aStack) { + return 10000; + } + + public int getPollutionPerTick(ItemStack aStack) { + return 250; + } + + public int getDamageToComponent(ItemStack aStack) { + return 0; + } + + public boolean explodesOnComponentBreak(ItemStack aStack) { + return false; + } +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index d93260733a..e64b38e382 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -51,6 +51,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase @Override public String[] getDescription() { return new String[]{ + "THIS MULTIBLOCK IS DISABLED - DO NOT BUILD", "Controller Block for the Tree Farmer", "How to get your first logs without an axe.", "Size(WxHxD): 15x2x15", diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index d77edb631b..a501061849 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -64,7 +64,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe "Consumes " + this.ENERGY_TAX + "% of the average voltage of all energy type hatches", "Power can be Input/Extracted from the rear face at any time, change with screwdriver", "Can be built with variable height between " + (CELL_HEIGHT_MIN + 2) + "-" + (CELL_HEIGHT_MAX + 2) + "", - "Redox Cells can be upgraded via the GUI without having to deconstruct the multiblock", + "Redox Cells can be upgraded via the GUI without having to deconstruct the multiblock (WIP)", "Size(WxHxD): External 5xHx5, Sub-Station Casings, Controller (Bottom, Centre)", "Size(WxHxD): Internal 3x(H-2)x3, Energy Storage Cells", "Number and quality of cells determines power storage", diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV new file mode 100644 index 0000000000..d063d85b1f --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV @@ -0,0 +1,15 @@ + + +public class GregtechGeneratorsULV { + public static void run(){ + + GregtechItemList.Generator_Diesel_ULV.set(new GT_MetaTileEntity_ULV_CombustionGenerator(960, "basicgenerator.diesel.tier.00", "Simple Combustion Generator", 0).getStackForm(1L)); + GregtechItemList.Generator_Gas_Turbine_ULV.set(new GT_MetaTileEntity_ULV_GasTurbine(961, "basicgenerator.gas.tier.00", "Simple Gas Turbine", 0).getStackForm(1L)); + GregtechItemList.Generator_Steam_Turbine_ULV.set(new GT_MetaTileEntity_ULV_SteamTurbine(962, "basicgenerator.steam.tier.00", "Simple Steam Turbine", 0).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_Diesel_ULV.get(1L, new Object[0]), bitsd, new Object[]{"PCP", "EME", "GWG", 'M', ItemList.Hull_ULV, 'P', GregtechItemList.Electric_Piston_ULV, 'E', GregtechItemList.Electric_Motor_ULV, 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'G', OrePrefixes.gearGt.get(Materials.Bronze)}); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_Gas_Turbine_ULV.get(1L, new Object[0]), bitsd, new Object[]{"CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV, 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy)}); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_Steam_Turbine_ULV.get(1L, new Object[0]), bitsd, new Object[]{"PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV, 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', OrePrefixes.pipeMedium.get(Materials.Copper)}); + + } +} \ No newline at end of file -- cgit From 54f1060e09e2210e345b082421f9e83df9dcfbc0 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 17:04:41 +1000 Subject: % More --- src/Java/gtPlusPlus/core/recipe/common/CI.java | 1 + .../ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java | 2 ++ .../processing/advanced/GregtechMetaTileEntity_Adv_EBF.java | 12 ++++++++++++ .../advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java | 10 ++++++---- .../advanced/GregtechMetaTileEntity_Adv_Implosion.java | 8 ++++++++ 5 files changed, 29 insertions(+), 4 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index 44db9cf284..1f06c5befb 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -18,6 +18,7 @@ import gtPlusPlus.core.recipe.LOADER_Machine_Components; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; import ic2.core.Ic2Items; public class CI { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java index 63cf78e8bc..6537f530b8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java @@ -13,6 +13,8 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; +import gregtech.common.tileentities.generators.GT_MetaTileEntity_DieselGenerator; + import net.minecraft.item.ItemStack; public class GT_MetaTileEntity_ULV_CombustionGenerator diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index 3cf13cff9b..a8482960d0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.a import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; +import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; import gregtech.api.gui.GT_GUIContainer_MultiMachine; import gregtech.api.interfaces.ITexture; @@ -14,6 +15,11 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; + +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; @@ -239,4 +245,10 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase return false; } + @Override + public boolean hasSlotInGUI() { + // TODO Auto-generated method stub + return false; + } + } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java index dbce76938b..e5b690b7a5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java @@ -5,15 +5,17 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer; + import net.minecraft.block.Block; -public class GregtechMetaTileEntity_Advanced_Fusion_MK4 extends GT_MetaTileEntity_FusionComputer { +public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_FusionComputer { - public GregtechMetaTileEntity_Advanced_Fusion_MK4(int aID, String aName, String aNameRegional) { + public GregtechMetaTileEntity_Adv_Fusion_MK4(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 6); } - public GregtechMetaTileEntity_Advanced_Fusion_MK4(String aName) { + public GregtechMetaTileEntity_Adv_Fusion_MK4(String aName) { super(aName); } @@ -29,7 +31,7 @@ public class GregtechMetaTileEntity_Advanced_Fusion_MK4 extends GT_MetaTileEntit @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_Advanced_Fusion_MK4(mName); + return new GregtechMetaTileEntity_Adv_Fusion_MK4(mName); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java index b63ad8d6de..d696868f12 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java @@ -10,6 +10,9 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockB import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; + +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; + import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -120,4 +123,9 @@ public class GregtechMetaTileEntity_Adv_Implosion public boolean explodesOnComponentBreak(ItemStack aStack) { return false; } + + @Override + public boolean hasSlotInGUI() { + return true; + } } \ No newline at end of file -- cgit From c9b703f2e67c62d5186abb403e61468709666880 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 17:00:15 +1000 Subject: % Initial Commit --- .../generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java index 6537f530b8..63cf78e8bc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java @@ -13,8 +13,6 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_DieselGenerator; - import net.minecraft.item.ItemStack; public class GT_MetaTileEntity_ULV_CombustionGenerator -- cgit From d2dfc22dda794f4366ad15dc252110d69de6d0fa Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 17:04:41 +1000 Subject: % More --- .../generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java index 63cf78e8bc..6537f530b8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java @@ -13,6 +13,8 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; +import gregtech.common.tileentities.generators.GT_MetaTileEntity_DieselGenerator; + import net.minecraft.item.ItemStack; public class GT_MetaTileEntity_ULV_CombustionGenerator -- cgit From d875764bcc49df6208f43a88147c4fdb563adba9 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 17:27:07 +1000 Subject: % Whitespace Fixes. $ Backported Changes from master branch. --- src/Java/gtPlusPlus/core/commands/CommandMath.java | 13 ++- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 1 + src/Java/gtPlusPlus/core/material/Material.java | 110 ++++++++++----------- .../core/util/minecraft/MaterialUtils.java | 32 +++--- .../GT_MetaTileEntity_ULV_CombustionGenerator.java | 34 +++---- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 26 ++--- .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 34 +++---- 7 files changed, 121 insertions(+), 129 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/commands/CommandMath.java b/src/Java/gtPlusPlus/core/commands/CommandMath.java index 9c51aa7a9b..6ab0b2cbc6 100644 --- a/src/Java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/Java/gtPlusPlus/core/commands/CommandMath.java @@ -56,7 +56,7 @@ public class CommandMath implements ICommand final World W = S.getEntityWorld(); final EntityPlayer P = CommandUtils.getPlayer(S); if (!W.isRemote && P != null){ - if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1")) { + if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1")) { String[] prefixes = new String[] { "ingot", "plate", @@ -83,8 +83,8 @@ public class CommandMath implements ICommand "Silver", "Lead", "Aluminium" - }; - AutoMap itemEntities = new AutoMap(); + }; + AutoMap itemEntities = new AutoMap(); for (String g : prefixes) { for (String s : loots) { itemEntities.put(new EntityItem(W, P.posX, P.posY, P.posZ, ItemUtils.getItemStackOfAmountFromOreDictNoBroken(g+s, 64))); @@ -92,7 +92,7 @@ public class CommandMath implements ICommand for (EntityItem e : itemEntities.values()) { e.lifespan = 30000; } - + } } @@ -195,7 +195,7 @@ public class CommandMath implements ICommand public boolean canCommandSenderUseCommand(final ICommandSender var1){ final EntityPlayer P = CommandUtils.getPlayer(var1); if (P == null){ - return false; + return false; } if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1")) { return true; @@ -220,5 +220,4 @@ public class CommandMath implements ICommand return true; } -} - +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 2c09ba1f03..d34e1a1856 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -58,6 +58,7 @@ public class COMPAT_HANDLER { new RECIPES_LaserEngraver(); new RECIPES_Extruder(); + GregtechGeneratorsULV.run(); GregtechEnergyBuffer.run(); GregtechLFTR.run(); GregtechSteamCondenser.run(); diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index fe8b638d5b..1b2ef19b53 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -76,7 +76,7 @@ public class Material { public Material(String materialName, MaterialState defaultState, short[] rgba, int radiationLevel, MaterialStack[] materialStacks) { this(materialName, defaultState, null, 0, rgba, -1, -1, -1, -1, false, "", radiationLevel, false, materialStacks); - } + } public Material(String materialName, MaterialState defaultState, short[] rgba, int j, int k, int l, int m, int radiationLevel, MaterialStack[] materialStacks){ this(materialName, defaultState, null, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks); @@ -104,7 +104,7 @@ public class Material { public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){ this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, inputs); - } + } public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean addCells,final MaterialStack... inputs) { this (materialName, defaultState, null, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, addCells, true, inputs); @@ -113,7 +113,7 @@ public class Material { public Material(final String materialName, final MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){ this (materialName, defaultState, null, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, true, true, inputs); } - + public Material(final String materialName, final MaterialState defaultState, final TextureSet set, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean generateCells, final MaterialStack... inputs){ this (materialName, defaultState, null, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, true, true, inputs); } @@ -289,32 +289,32 @@ public class Material { this.vChemicalFormula = "??"; } - if (generateFluid){ - final Materials isValid = Materials.get(this.getLocalizedName()); - if (FluidUtils.getFluidStack(localizedName, 1) != null){ - this.vMoltenFluid = FluidUtils.getFluidStack(localizedName, 1).getFluid(); - } - else if (isValid == null || isValid == Materials._NULL){ - this.vMoltenFluid = this.generateFluid(); - } - else { - if (isValid.mFluid != null){ - this.vMoltenFluid = isValid.mFluid; + if (generateFluid){ + final Materials isValid = Materials.get(this.getLocalizedName()); + if (FluidUtils.getFluidStack(localizedName, 1) != null){ + this.vMoltenFluid = FluidUtils.getFluidStack(localizedName, 1).getFluid(); } - else if (isValid.mGas != null){ - this.vMoltenFluid = isValid.mGas; + else if (isValid == null || isValid == Materials._NULL){ + this.vMoltenFluid = this.generateFluid(); } else { - this.vMoltenFluid = this.generateFluid(); + if (isValid.mFluid != null){ + this.vMoltenFluid = isValid.mFluid; + } + else if (isValid.mGas != null){ + this.vMoltenFluid = isValid.mGas; + } + else { + this.vMoltenFluid = this.generateFluid(); + } } - } - this.vPlasma = this.generatePlasma(); - } - else { - this.vMoltenFluid = null; - this.vPlasma = null; - } + this.vPlasma = this.generatePlasma(); + } + else { + this.vMoltenFluid = null; + this.vPlasma = null; + } String ratio = ""; if (this.vSmallestRatio != null) { @@ -344,17 +344,17 @@ public class Material { public final TextureSet getTextureSet() { synchronized(this) { return textureSet; - } + } } public TextureSet setTextureSet(TextureSet set) { if (set != null) { - return set; + return set; } else { // build hash table with count AutoMap sets = new AutoMap(); - if (this.vMaterialInput != null) { + if (this.vMaterialInput != null) { for (MaterialStack r : this.vMaterialInput) { if (r.getStackMaterial().getTextureSet().mSetName.toLowerCase().contains("fluid")) { sets.put(ELEMENT.getInstance().GOLD); @@ -362,16 +362,16 @@ public class Material { else { sets.put(r.getStackMaterial()); } - } - TextureSet mostUsedTypeTextureSet = (TextureSet) MaterialUtils.getMostCommonTextureSet(new ArrayList(sets.values())); + } + TextureSet mostUsedTypeTextureSet = (TextureSet) MaterialUtils.getMostCommonTextureSet(new ArrayList(sets.values())); if (mostUsedTypeTextureSet != null && mostUsedTypeTextureSet instanceof TextureSet) { Logger.MATERIALS("Set textureset for "+this.localizedName+" to be "+mostUsedTypeTextureSet.mSetName+"."); return mostUsedTypeTextureSet; - } + } } } Logger.MATERIALS("Set textureset for "+this.localizedName+" to be "+Materials.Iron.mIconSet.mSetName+". [Fallback]"); - return Materials.Iron.mIconSet; + return Materials.Iron.mIconSet; } public final String getLocalizedName(){ @@ -402,7 +402,7 @@ public class Material { final public short[] getRGBA(){ if (this.RGBA != null) { if (this.RGBA.length == 4){ - return this.RGBA; + return this.RGBA; } else { return new short[]{this.RGBA[0], this.RGBA[1], this.RGBA[2], 0}; @@ -570,17 +570,17 @@ public class Material { } public final ItemStack getCrushedCentrifuged(final int stacksize){ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("crushedCentrifuged"+this.unlocalizedName, stacksize); - } + } public final ItemStack getDustPurified(final int stacksize){ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPure"+this.unlocalizedName, stacksize); } public final ItemStack getDustImpure(final int stacksize){ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustImpure"+this.unlocalizedName, stacksize); - } + } public final boolean hasSolidForm() { if (this.getDust(1) != null || this.getBlock(1) != null || this.getSmallDust(1) != null || this.getTinyDust(1) != null) { return true; - } + } return false; } @@ -605,7 +605,7 @@ public class Material { Logger.INFO("Failed setting slot "+i+", using "+this.localizedName); } } - return temp; + return temp; } return new ItemStack[]{}; } @@ -781,8 +781,8 @@ public class Material { if (a5 != null){ Logger.INFO("Using a pre-defined Fluid from GT. Plasma."); return a5.getFluid(); - } - Logger.INFO("Using null."); + } + Logger.INFO("Using null."); return null; } } @@ -791,37 +791,37 @@ public class Material { if (this.materialState == MaterialState.SOLID){ if (isValid.mFluid != null){ Logger.INFO("Using a pre-defined Fluid from GT. mFluid."); - return isValid.mFluid; - } + return isValid.mFluid; + } else if (isValid.mStandardMoltenFluid != null){ Logger.INFO("Using a pre-defined Fluid from GT. mStandardMoltenFluid."); - return isValid.mStandardMoltenFluid; + return isValid.mStandardMoltenFluid; } } else if (this.materialState == MaterialState.GAS){ if (isValid.mGas != null){ Logger.INFO("Using a pre-defined Fluid from GT. mGas."); - return isValid.mGas; - } + return isValid.mGas; + } } else if (this.materialState == MaterialState.LIQUID || this.materialState == MaterialState.PURE_LIQUID){ if (isValid.mFluid != null){ Logger.INFO("Using a pre-defined Fluid from GT. mFluid."); - return isValid.mFluid; - } + return isValid.mFluid; + } else if (isValid.mGas != null){ Logger.INFO("Using a pre-defined Fluid from GT. mGas."); - return isValid.mGas; + return isValid.mGas; } else if (isValid.mStandardMoltenFluid != null){ Logger.INFO("Using a pre-defined Fluid from GT. mStandardMoltenFluid."); - return isValid.mStandardMoltenFluid; + return isValid.mStandardMoltenFluid; } - } + } Logger.INFO("Generating our own fluid."); //Generate a Cell if we need to - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){ + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){ if (this.vGenerateCells){ new BaseItemCell(this); Logger.INFO("Generated a cell for "+this.getUnlocalizedName()); @@ -873,7 +873,7 @@ public class Material { if (this.materialState == MaterialState.ORE){ return null; } - final Materials isValid = Materials.get(this.getLocalizedName()); + final Materials isValid = Materials.get(this.getLocalizedName()); if (!this.vGenerateCells){ return null; @@ -885,8 +885,8 @@ public class Material { } if (isValid.mPlasma != null){ Logger.INFO("Using a pre-defined Plasma from GT."); - return isValid.mPlasma; - } + return isValid.mPlasma; + } Logger.INFO("Generating our own Plasma."); return FluidUtils.addGTPlasma(this); @@ -894,10 +894,10 @@ public class Material { - final public FluidStack getFluid(final int fluidAmount) { + final public FluidStack getFluid(final int fluidAmount) { if (this.vMoltenFluid == null){ return null; - } + } final FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount); return moltenFluid; } @@ -987,4 +987,4 @@ public class Material { } } -} +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index e9d68ea864..98b02078c6 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -27,11 +27,11 @@ public class MaterialUtils { @SuppressWarnings({ "rawtypes", "unused" }) private static Class[][] commonTypes = -{{Materials.class, int.class, TextureSet.class, float.class, int.class, - int.class, int.class, int.class, int.class, int.class, int.class, - String.class, int.class, int.class, int.class, int.class, boolean.class, - boolean.class, int.class, int.class, int.class, Dyes.class, int.class, - List.class , List.class}}; + {{Materials.class, int.class, TextureSet.class, float.class, int.class, + int.class, int.class, int.class, int.class, int.class, int.class, + String.class, int.class, int.class, int.class, int.class, boolean.class, + boolean.class, int.class, int.class, int.class, Dyes.class, int.class, + List.class , List.class}}; public static List oreDictValuesForEntry(final String oredictName){ List oredictItemNames; @@ -47,7 +47,7 @@ public class MaterialUtils { public static Material generateMaterialFromGtENUM(final Materials material){ return generateMaterialFromGtENUM(material, null); } - + public static Material generateMaterialFromGtENUM(final Materials material, short[] customRGB){ @SuppressWarnings("deprecation") String name = material.name(); @@ -68,12 +68,12 @@ public class MaterialUtils { if (material.isRadioactive()){ radioactivity = 1; } - + //Weird Blacklist of Bad Chemical Strings if (material.mElement == Element.Pb || material.mElement == Element.Na || material.mElement == Element.Ar){ chemicalFormula = StringUtils.subscript(Utils.sanitizeString(material.mElement.name())); } - + //Determine default state Logger.MATERIALS("[Debug] Setting State of GT generated material. "+material.mDefaultLocalName); if (material.getMolten(1) != null || material.getSolid(1) != null){ @@ -140,10 +140,10 @@ public class MaterialUtils { return temp; } - public static boolean hasValidRGBA(final short[] rgba){ + public static boolean hasValidRGBA(final short[] rgba){ if (rgba == null || rgba.length < 3 || rgba.length > 4){ return false; - } + } return true; } @@ -184,9 +184,9 @@ public class MaterialUtils { } public static Materials getMaterialByName(String materialName) { - + if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - return (Materials) EnumUtils.getValue(gregtech.api.enums.Materials.class, materialName, false); + return (Materials) EnumUtils.getValue(gregtech.api.enums.Materials.class, materialName, false); } else { for (Materials m : Materials.values()) { @@ -197,7 +197,7 @@ public class MaterialUtils { return null; } } - + @SuppressWarnings("deprecation") public static String getMaterialName(Materials mat){ String mName; @@ -212,14 +212,12 @@ public class MaterialUtils { } return mName; } - + public static TextureSet getMostCommonTextureSet(List list) { Optional r = list.stream().map(Material::getTextureSet).collect(Collectors.groupingBy(Function.identity(), Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey); TextureSet o = (r != null && r.isPresent() && r.get() != null) ? r.get() : null; return o; - } - - } +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java index 6537f530b8..b92a9ce06b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java @@ -1,39 +1,33 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; -import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; import gregtech.common.tileentities.generators.GT_MetaTileEntity_DieselGenerator; -import net.minecraft.item.ItemStack; +public class GT_MetaTileEntity_ULV_CombustionGenerator extends GT_MetaTileEntity_DieselGenerator { + public GT_MetaTileEntity_ULV_CombustionGenerator(int aID, String aName, String aNameRegional, int aTier) { + super(aID, aName, aNameRegional, aTier); + } -public class GT_MetaTileEntity_ULV_CombustionGenerator - extends GT_MetaTileEntity_DieselGenerator { + public GT_MetaTileEntity_ULV_CombustionGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + } + @Override + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_ULV_CombustionGenerator(this.mName, this.mTier, this.mDescription, this.mTextures); + } + @Override public int getCapacity() { return 16000; } + @Override public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier." + this.mTier, (100 - 1 * 5)); - } - - public int getEfficiency() { - return this.mEfficiency; - } - - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ULV_CombustionGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier." + this.mTier, 95); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java index 1efb0b8ca6..cc56ef947c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java @@ -2,31 +2,31 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Recipe; +import gregtech.common.tileentities.generators.GT_MetaTileEntity_GasTurbine; -public class GT_MetaTileEntity_ULV_GasTurbine - extends GT_MetaTileEntity_GasTurbine { +public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbine { + public GT_MetaTileEntity_ULV_GasTurbine(int aID, String aName, String aNameRegional, int aTier) { + super(aID, aName, aNameRegional, aTier); + } + + public GT_MetaTileEntity_ULV_GasTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + } public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ULV_GasTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new GT_MetaTileEntity_ULV_GasTurbine(this.mName, this.mTier, this.mDescription, this.mTextures); } + @Override public int getCapacity() { return 16000; } + @Override public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, (100 - 1 * 5)); - } - - public int getEfficiency() { - return this.mEfficiency; + this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, 95); } - } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java index cc4c7cce3c..7184177d20 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java @@ -2,32 +2,32 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Recipe; -import net.minecraftforge.fluids.FluidStack; +import gregtech.common.tileentities.generators.GT_MetaTileEntity_SteamTurbine; public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamTurbine { - - public int getCapacity() { - return 12000; + public GT_MetaTileEntity_ULV_SteamTurbine(int aID, String aName, String aNameRegional, int aTier) { + super(aID, aName, aNameRegional, aTier); } - public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SteamTurbine.efficiency.tier." + this.mTier, 6 + 1); + public GT_MetaTileEntity_ULV_SteamTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); } - public int getEfficiency() { - return this.mEfficiency; + + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_ULV_SteamTurbine(this.mName, this.mTier, this.mDescription, this.mTextures); + } + + @Override + public int getCapacity() { + return 16000; } - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ULV_SteamTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + @Override + public void onConfigLoad() { + this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SteamTurbine.efficiency.tier." + this.mTier, 6 + 1); } - -} \ No newline at end of file +} -- cgit From c4a201a62207f93aae0b7693af95c3c4df75b92c Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 17:40:27 +1000 Subject: % Cleanup --- src/Java/gtPlusPlus/GTplusplus.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index a8c880c660..80c7959a4f 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -162,8 +162,8 @@ public class GTplusplus implements ActionListener { @EventHandler public void serverStarting(final FMLServerStartingEvent event) { - - if (CORE.DEVENV) + + if (CORE.DEVENV) event.registerServerCommand(new CommandMath()); //Chunk Loading -- cgit From 1a03af3432c350a8805340f2c9118c89763dca24 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 18:14:09 +1000 Subject: + Added recipes for all Advanced Multis. + Added new casings for Advanced EBF. $ Fixed issue with AIC tooltip. --- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 132 +++++++++++++-------- .../common/blocks/GregtechMetaCasingBlocks3.java | 4 +- .../GregtechMetaTileEntity_Adv_Implosion.java | 6 +- 3 files changed, 87 insertions(+), 55 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 55b7793f93..cda886eb24 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -212,46 +212,42 @@ public class RECIPES_Machines { } if (LoadedMods.Gregtech){ - - - //Lava Boiler boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1); //IV MACHINES - if (!CORE.GTNH){ - EV_MACHINE_Electrolyzer = ItemList.Machine_EV_Electrolyzer.get(1); - EV_MACHINE_BendingMachine= ItemList.Machine_EV_Bender.get(1); - EV_MACHINE_Wiremill= ItemList.Machine_EV_Wiremill.get(1); - HV_MACHINE_Macerator= ItemList.Machine_HV_Macerator.get(1); - EV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1); - EV_MACHINE_MassFabricator= ItemList.Machine_EV_Massfab.get(1); - EV_MACHINE_Centrifuge= ItemList.Machine_EV_Centrifuge.get(1); - EV_MACHINE_Cutter = ItemList.Machine_EV_Cutter.get(1); - EV_MACHINE_Extruder = ItemList.Machine_EV_Extruder.get(1); - EV_MACHINE_Sifter = ItemList.Machine_EV_Sifter.get(1); - EV_MACHINE_ThermalCentrifuge = ItemList.Machine_EV_ThermalCentrifuge.get(1); - EV_MACHINE_OreWasher = ItemList.Machine_EV_OreWasher.get(1); - EV_MACHINE_AlloySmelter = ItemList.Machine_EV_AlloySmelter.get(1); + EV_MACHINE_Electrolyzer = ItemList.Machine_EV_Electrolyzer.get(1); + EV_MACHINE_BendingMachine= ItemList.Machine_EV_Bender.get(1); + EV_MACHINE_Wiremill= ItemList.Machine_EV_Wiremill.get(1); + HV_MACHINE_Macerator= ItemList.Machine_HV_Macerator.get(1); + EV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1); + EV_MACHINE_MassFabricator= ItemList.Machine_EV_Massfab.get(1); + EV_MACHINE_Centrifuge= ItemList.Machine_EV_Centrifuge.get(1); + EV_MACHINE_Cutter = ItemList.Machine_EV_Cutter.get(1); + EV_MACHINE_Extruder = ItemList.Machine_EV_Extruder.get(1); + EV_MACHINE_Sifter = ItemList.Machine_EV_Sifter.get(1); + EV_MACHINE_ThermalCentrifuge = ItemList.Machine_EV_ThermalCentrifuge.get(1); + EV_MACHINE_OreWasher = ItemList.Machine_EV_OreWasher.get(1); + EV_MACHINE_AlloySmelter = ItemList.Machine_EV_AlloySmelter.get(1); } - //Balance or some shit + //Balanced opposites else { - EV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1); - EV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1); - EV_MACHINE_Wiremill= ItemList.Machine_IV_Wiremill.get(1); - HV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1); - EV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1); - EV_MACHINE_MassFabricator= ItemList.Machine_LuV_Massfab.get(1); - EV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1); - EV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1); - EV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1); - EV_MACHINE_Sifter = ItemList.Machine_IV_Sifter.get(1); - EV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1); - EV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1); - EV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1); + EV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1); + EV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1); + EV_MACHINE_Wiremill= ItemList.Machine_IV_Wiremill.get(1); + HV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1); + EV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1); + EV_MACHINE_MassFabricator= ItemList.Machine_LuV_Massfab.get(1); + EV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1); + EV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1); + EV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1); + EV_MACHINE_Sifter = ItemList.Machine_IV_Sifter.get(1); + EV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1); + EV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1); + EV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1); } - + } @@ -286,22 +282,6 @@ public class RECIPES_Machines { "circuitMaster",ItemList.Cover_Screen.get(1),CI.getDataOrb(), GregtechItemList.Gregtech_Computer_Cube.get(1)); - /*RecipeUtils.addShapedGregtechRecipe( - CI.electricPiston_EV, OrePrefixes.circuit.get(Materials.Ultimate), CI.electricPiston_EV, - CI.electricMotor_EV, CI.machineCasing_EV, CI.electricMotor_EV, - "gearGtTitanium", "cableGt02Aluminium", "gearGtTitanium", - ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 793, 1)); - RecipeUtils.addShapedGregtechRecipe( - CI.electricPiston_IV, OrePrefixes.circuit.get(Materials.Superconductor), CI.electricPiston_IV, - CI.electricMotor_IV, CI.machineCasing_IV, CI.electricMotor_IV, - "gearGtTungstenSteel", "cableGt02Platinum", "gearGtTungstenSteel", - ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 794, 1)); - RecipeUtils.addShapedGregtechRecipe( - CI.electricPiston_LuV, OrePrefixes.circuit.get(Materials.Infinite), CI.electricPiston_LuV, - CI.electricMotor_LuV, CI.machineCasing_LuV, CI.electricMotor_LuV, - "gearGtChrome", "cableGt02Tungsten", "gearGtChrome", - ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 795, 1));*/ - //Buffer Core RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[1], cableTier1, CI.component_Plate[1], @@ -1196,9 +1176,59 @@ public class RECIPES_Machines { plate,CI.getTieredCircuit(2),plate, GregtechItemList.Industrial_FishingPond.get(1)); } - - - + + if (true) { + + //Advanced Vacuum Freezer + ItemStack plate = ALLOY.HASTELLOY_N.getPlateDouble(1); + ItemStack gear = ALLOY.HASTELLOY_N.getGear(1); + ItemStack frame = ALLOY.HASTELLOY_N.getFrameBox(1); + ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1); + ItemStack cell2 = ItemList.Reactor_Coolant_NaK_6.get(1); + + RecipeUtils.recipeBuilder( + plate, gear, plate, + cell1, frame, cell2, + plate, gear, plate, + GregtechItemList.Casing_AdvancedVacuum.get(Casing_Amount)); + RecipeUtils.recipeBuilder( + gear,CI.getTieredCircuit(6),gear, + CI.electricPiston_IV, GregtechItemList.Casing_AdvancedVacuum.get(1), CI.electricPiston_IV, + plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate, + GregtechItemList.Industrial_Cryogenic_Freezer.get(1)); + + //Advanced Blast Furnaace + plate = ALLOY.HG1223.getPlateDouble(1); + gear = ALLOY.INCOLOY_MA956.getGear(1); + frame = ALLOY.INCOLOY_DS.getFrameBox(1); + cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); + cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); + ItemStack cell3 = ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1); + + RecipeUtils.recipeBuilder( + plate, cell1, plate, + cell3, frame, cell2, + plate, gear, plate, + GregtechItemList.Casing_Adv_BlastFurnace.get(Casing_Amount)); + RecipeUtils.recipeBuilder( + gear,CI.getTieredCircuit(6),gear, + CI.robotArm_IV, GregtechItemList.Casing_Adv_BlastFurnace.get(1), CI.robotArm_IV, + plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate, + GregtechItemList.Machine_Adv_BlastFurnace.get(1)); + + //Advanced Implosion Compressor + plate = ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 1); + gear = ALLOY.HG1223.getGear(1); + frame = ALLOY.HG1223.getFrameBox(1); + cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); + cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); + + RecipeUtils.recipeBuilder( + gear,CI.getTieredCircuit(6),gear, + CI.fieldGenerator_IV, CI.machineHull_ZPM, CI.robotArm_IV, + plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate, + GregtechItemList.Machine_Adv_ImplosionCompressor.get(1)); + } if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine){ ItemStack plate = ALLOY.STABALLOY.getPlate(1); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java index c38d2ff6bf..aaf4f9f1a6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java @@ -56,7 +56,7 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (MAX)"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Placeholder"); + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Placeholder"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Placeholder"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Placeholder"); @@ -72,7 +72,7 @@ extends GregtechMetaCasingBlocksAbstract { GregtechItemList.Casing_Vanadium_Redox_MAX.set(new ItemStack(this, 1, 8)); GregtechItemList.Casing_AmazonWarehouse.set(new ItemStack(this, 1, 9)); GregtechItemList.Casing_AdvancedVacuum.set(new ItemStack(this, 1, 10)); - //GregtechItemList.Casing_ThermalContainment.set(new ItemStack(this, 1, 11)); + GregtechItemList.Casing_Adv_BlastFurnace.set(new ItemStack(this, 1, 11)); //GregtechItemList.Casing_Autocrafter.set(new ItemStack(this, 1, 12)); //GregtechItemList.Casing_CuttingFactoryFrame.set(new ItemStack(this, 1, 13)); //GregtechItemList.Casing_TeslaTower.set(new ItemStack(this, 1, 14)); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java index bfd5c8b25a..30393128dd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java @@ -7,7 +7,6 @@ import gregtech.api.gui.GT_GUIContainer_MultiMachine; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; @@ -40,7 +39,10 @@ public class GregtechMetaTileEntity_Adv_Implosion return new GregtechMetaTileEntity_Adv_Implosion(this.mName); } - public String[] getDescription() { + public String[] getDescription() { + if (mCasingName.contains("gt.blockcasings")) { + mCasingName = ItemList.Casing_RobustTungstenSteel.get(1).getDisplayName(); + } return new String[]{ "Controller Block for the Advanced Implosion Compressor", "Size(WxHxD): 3x3x3 (Hollow), Controller (Front centered)", -- cgit From c250381837a416e58a0ecc632c8a314d8f25b076 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 18:45:53 +1000 Subject: + Added recipe for the Air Intake Hatch. + Added new textures for the Adv. Vac. Freezer and casings. % Gave old Adv. Vac. Freezer texture to Adv. EBF. % Swapped recipe materials for Adv. Vac. and EBF. --- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 131 +++++++++++++-------- .../blocks/textures/CasingTextureHandler3.java | 6 +- .../common/blocks/textures/TexturesGtBlock.java | 1 + .../MACHINE_CASING_ADVANCED_CRYOGENIC.png | Bin 601 -> 586 bytes .../MACHINE_CASING_ADVANCED_VOLCANUS.png | Bin 0 -> 601 bytes 5 files changed, 84 insertions(+), 54 deletions(-) create mode 100644 src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index cda886eb24..0cb36d4859 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -13,6 +13,7 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -859,7 +860,14 @@ public class RECIPES_Machines { CI.component_Plate[2], CI.electricMotor_ULV, CI.component_Plate[2], CI.getTieredCircuit(1), CI.machineHull_LV, CI.getTieredCircuit(0), GregtechItemList.Pollution_Detector.get(1)); - + + //Air Intake Hatch + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[6], ItemList.Casing_Grate.get(1), CI.component_Plate[6], + CI.component_Plate[6], ItemList.FluidRegulator_IV.get(1), CI.component_Plate[6], + CI.getTieredCircuit(5), ItemList.Hatch_Input_IV.get(1), CI.getTieredCircuit(5), + GregtechItemList.Hatch_Air_Intake.get(1)); + //ULV RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[0], ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), CI.component_Plate[0], @@ -1176,58 +1184,79 @@ public class RECIPES_Machines { plate,CI.getTieredCircuit(2),plate, GregtechItemList.Industrial_FishingPond.get(1)); } - + if (true) { + //Advanced Vacuum Freezer + ItemStack plate = ALLOY.HG1223.getPlateDouble(1); + ItemStack gear = ALLOY.INCOLOY_MA956.getGear(1); + ItemStack frame = ALLOY.INCOLOY_DS.getFrameBox(1); + ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1); + ItemStack cell2 = ItemList.Reactor_Coolant_NaK_6.get(1); - //Advanced Vacuum Freezer - ItemStack plate = ALLOY.HASTELLOY_N.getPlateDouble(1); - ItemStack gear = ALLOY.HASTELLOY_N.getGear(1); - ItemStack frame = ALLOY.HASTELLOY_N.getFrameBox(1); - ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1); - ItemStack cell2 = ItemList.Reactor_Coolant_NaK_6.get(1); - - RecipeUtils.recipeBuilder( - plate, gear, plate, - cell1, frame, cell2, - plate, gear, plate, - GregtechItemList.Casing_AdvancedVacuum.get(Casing_Amount)); - RecipeUtils.recipeBuilder( - gear,CI.getTieredCircuit(6),gear, - CI.electricPiston_IV, GregtechItemList.Casing_AdvancedVacuum.get(1), CI.electricPiston_IV, - plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate, - GregtechItemList.Industrial_Cryogenic_Freezer.get(1)); - - //Advanced Blast Furnaace - plate = ALLOY.HG1223.getPlateDouble(1); - gear = ALLOY.INCOLOY_MA956.getGear(1); - frame = ALLOY.INCOLOY_DS.getFrameBox(1); - cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); - cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); - ItemStack cell3 = ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1); - - RecipeUtils.recipeBuilder( - plate, cell1, plate, - cell3, frame, cell2, - plate, gear, plate, - GregtechItemList.Casing_Adv_BlastFurnace.get(Casing_Amount)); - RecipeUtils.recipeBuilder( - gear,CI.getTieredCircuit(6),gear, - CI.robotArm_IV, GregtechItemList.Casing_Adv_BlastFurnace.get(1), CI.robotArm_IV, - plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate, - GregtechItemList.Machine_Adv_BlastFurnace.get(1)); - - //Advanced Implosion Compressor - plate = ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 1); - gear = ALLOY.HG1223.getGear(1); - frame = ALLOY.HG1223.getFrameBox(1); - cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); - cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); - - RecipeUtils.recipeBuilder( - gear,CI.getTieredCircuit(6),gear, - CI.fieldGenerator_IV, CI.machineHull_ZPM, CI.robotArm_IV, - plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate, - GregtechItemList.Machine_Adv_ImplosionCompressor.get(1)); + RecipeUtils.recipeBuilder( + plate, gear, plate, + cell1, frame, cell2, + plate, gear, plate, + GregtechItemList.Casing_AdvancedVacuum.get(Casing_Amount)); + RecipeUtils.recipeBuilder( + gear,CI.getTieredCircuit(6),gear, + CI.electricPiston_IV, GregtechItemList.Casing_AdvancedVacuum.get(1), CI.electricPiston_IV, + plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate, + GregtechItemList.Industrial_Cryogenic_Freezer.get(1)); + + //Advanced Blast Furnace + plate = ALLOY.HASTELLOY_N.getPlateDouble(1); + gear = ALLOY.HASTELLOY_W.getGear(1); + frame = ALLOY.HASTELLOY_X.getFrameBox(1); + cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); + cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); + ItemStack cell3 = ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1); + + RecipeUtils.recipeBuilder( + plate, cell1, plate, + cell3, frame, cell2, + plate, gear, plate, + GregtechItemList.Casing_Adv_BlastFurnace.get(Casing_Amount)); + RecipeUtils.recipeBuilder( + gear,CI.getTieredCircuit(6),gear, + CI.robotArm_IV, GregtechItemList.Casing_Adv_BlastFurnace.get(1), CI.robotArm_IV, + plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate, + GregtechItemList.Machine_Adv_BlastFurnace.get(1)); + + //Advanced Implosion Compressor + plate = ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 1); + gear = ALLOY.LEAGRISIUM.getGear(1); + frame = ALLOY.HG1223.getFrameBox(1); + cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); + cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); + + RecipeUtils.recipeBuilder( + gear,CI.getTieredCircuit(6),gear, + CI.fieldGenerator_IV, CI.machineHull_ZPM, CI.robotArm_IV, + plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate, + GregtechItemList.Machine_Adv_ImplosionCompressor.get(1)); + + + + //Supply Depot + plate = ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(1); + gear = ALLOY.TRINIUM_TITANIUM.getRing(1); + frame = ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1); + cell1 = CI.conveyorModule_EV; + cell2 = CI.electricMotor_IV; + ItemStack casingAmazon = GregtechItemList.Casing_AmazonWarehouse.get(1); + + RecipeUtils.recipeBuilder( + plate, ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1), plate, + cell1, frame, cell2, + plate, gear, plate, + GregtechItemList.Casing_AmazonWarehouse.get(Casing_Amount)); + RecipeUtils.recipeBuilder( + casingAmazon, CI.getTieredCircuit(7), casingAmazon, + CI.robotArm_LuV, ItemList.Machine_LuV_Unboxinator.get(1), CI.robotArm_LuV, + CI.conveyorModule_LuV, GregtechItemList.Gregtech_Computer_Cube.get(1), CI.conveyorModule_LuV, + GregtechItemList.Amazon_Warehouse_Controller.get(1)); + } if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine){ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java index a8d363ca0c..85654523fe 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java @@ -2,8 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; import net.minecraft.util.IIcon; -import gregtech.api.enums.Textures; - public class CasingTextureHandler3 { public static IIcon getIcon(final int aSide, final int aMeta) { //Texture ID's. case 0 == ID[57] @@ -40,9 +38,11 @@ public class CasingTextureHandler3 { //Amazon Warehouse Casing return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon(); case 10: + //Adv. Vac. Freezer return TexturesGtBlock.TEXTURE_CASING_ADVANCED_CRYOGENIC.getIcon(); case 11: - return TexturesGtBlock._PlaceHolder.getIcon(); + //Adv. EBF + return TexturesGtBlock.TEXTURE_CASING_ADVANCED_VOLCNUS.getIcon(); case 12: return TexturesGtBlock._PlaceHolder.getIcon(); case 13: diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index 4a8f3131b9..ea4e003988 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -209,6 +209,7 @@ public class TexturesGtBlock { public static final CustomIcon TEXTURE_CASING_AMAZON = new CustomIcon("TileEntities/CASING_AMAZON"); public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC = new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC"); + public static final CustomIcon TEXTURE_CASING_ADVANCED_VOLCNUS = new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS"); //Overlays //Fan Textures diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png index eb7affaa01..7222ca77d7 100644 Binary files a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png and b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png new file mode 100644 index 0000000000..eb7affaa01 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png differ -- cgit From 7a109ef51ab0de1926c344babb9b3a64aad0199b Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 19:21:25 +1000 Subject: + Added a book for Power Storage Solutions. - Removed some useless Meta Tiles. (This removes advanced Mixer recipes, but not the tiles themselves.) --- src/Java/gtPlusPlus/core/handler/BookHandler.java | 98 +++++++++++++--------- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 6 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 39 +++++---- .../gregtech/GregtechAdvancedMixer.java | 22 ++--- 4 files changed, 94 insertions(+), 71 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/handler/BookHandler.java b/src/Java/gtPlusPlus/core/handler/BookHandler.java index 131662214b..0d8ba21365 100644 --- a/src/Java/gtPlusPlus/core/handler/BookHandler.java +++ b/src/Java/gtPlusPlus/core/handler/BookHandler.java @@ -17,12 +17,12 @@ public class BookHandler { public static int mBookKeeperCount = 0; public static Map mBookMap = new HashMap(); - + public static BookTemplate book_ThermalBoiler; - public static BookTemplate book_TestNovel; + public static BookTemplate book_MultiPowerStation; public static BookTemplate book_ModularBauble; public static BookTemplate book_MultiMachineManual; - + public static void run(){ Logger.INFO("Writing books."); @@ -48,77 +48,99 @@ public class BookHandler { "Input and Output Slots are fully optional, you can place multiple ones of them or even none on the Machine. A Machine without Input couldn't process any Recipes, while a Machine without Output just voids all outputted Items and Liquids.", "It might be useful to use the Screwdriver on the Output Hatches to determine what is outputted where." }); - + //Test Novel - book_TestNovel = writeBookTemplate( - "TestBook", "A Book about the Gardens", "Alkalus", - new String[] {"There was once a sad and lonely oak tree."}); + book_MultiPowerStation = writeBookTemplate( + "Manual_Multi_PowerStation", + "Power Storage & You [Version 0.64]", + "Alkalus", + new String[] { + "So, when it comes to power storage you relaly have three Seperate options. \n"+ + "Battery Buffers [GT]\n"+ + "Energy Buffers [GT++]\n"+ + "The Power Sub-Station [GT++]\n", + + "The Battery Buffer" + "\n" + + "Is rather portable. Allowing you to throw set one up and insert batteries whevere you need."+"\n"+ + "They output 1A for each battery stored inside.", + + "The Energy Buffer" + "\n" + + "Is a more optimal choice for storage in your base. Once placed down, they cannot be moved without losing all stored power."+"\n"+ + "Energy Buffers can output 4A from the output side, however accept 16A as input.", + + "The Power Sub-Station"+"\n"+ + "Is used for storing Insane amounts of power later game."+"\n"+ + "Consumes 2% of the average voltage of all energy type hatches every tick."+"\n"+ + "Allows Insertation/Removal of power from the rear face of the controller, swap with a screwdriver."+"\n"+ + "Variable Height Structure, between 4-16Y. Inserted Redox Cells dictate max energy tier of structure."+"\n" + }); //Test Novel book_ModularBauble = writeBookTemplate( "Manual_Modular_Bauble", "How to: Modular Baubles", "Alkalus", new String[] { - "Concept: This idea came from wanting flexibility.", - "First step, Build a Modularity table to begin customisation of your Bauble." - + " After this has been constructed, you can now combine the upgrades listed within this book to improve the baubles level /100.", - "Defence:" - + " Can be upgraded by combining metal plates with the bauble." - + " | +1 | Aluminium Plate" - + " | +2 | Stainless Steel Plate" - + " | +3 | Tungsten Plate" - + " | +4 | TungstenSteel Plate" - + " | +5 | Naquadah Plate", - "There was once a sad and lonely oak tree.", - "There was once a sad and lonely oak tree.", - "There was once a sad and lonely oak tree."}); - + "Concept: This idea came from wanting flexibility. \n", + "First step, Build a Modularity table to begin customisation of your Bauble. \\n" + + " After this has been constructed, you can now combine the upgrades listed within this book to improve the baubles level /100.", + "Defence: \\n" + + " Can be upgraded by combining metal plates with the bauble. \\n" + + " | +1 | Aluminium Plate \\n" + + " | +2 | Stainless Steel Plate \\n" + + " | +3 | Tungsten Plate \\n" + + " | +4 | TungstenSteel Plate \\n" + + " | +5 | Naquadah Plate \\n", + "There was once a sad and lonely oak tree. \\n", + "There was once a sad and lonely oak tree. \n", + "There was once a sad and lonely oak tree. \\n"}); + //Test Novel //20/21/22 book_MultiMachineManual = writeBookTemplate( - "Manual_Multi_Machine", "Multi Machine Manual", "Alkalus", - new String[] {"This Multiblock, depending upon the mode used, can function as a variety of different machines. The idea behind this, was that most of these machines are rather niche compared to any others, as such, not used often.", - "To build, you need to construct a hollow 3x3x3 structure made from Multi-Use casings, With a minimum of 6. Any Casing position can be substituted out with an Input Hatch/Bus, an Output Hatch/Bus, Muffler, Maint. Hatch or Energy Injector Hatch.", - "The Mode can be set by using a Screwdriver on the controller block. Each mode allows the use of Numbered Circuits, to allow a different machine 'type' for each input bus. Mode 3 is currently disabled, as each machine requires special handling.", - "[Metal Work] Mode A - Allows the multiblock to function as a Compressor, a Lathe or an Electro-Magnet. To allow a hatch to run in Compressor mode, insert a No. 20 circuit. For Lathe, use No. 21 and for Electro-Magnet use No. 22.", - "[Fluid Work] Mode B - Allows the multiblock to function as a Fermenter, a Distillery or an Extractor. To allow a hatch to run in Fermenter mode, insert a No. 20 circuit. For Distillery, use No. 21 and for Extractor use No. 22.", - "[Misc. Work] Mode C - Allows the multiblock to function as a Laser Engraver, a Replicator or an Autoclave. To allow a hatch to run in Laser Engraver mode, insert a No. 20 circuit. For Autoclave, use No. 21 and for Replicator use No. 22. DISABLED.", - }); + "Manual_Multi_Machine", "Multi Machine Manual", "Alkalus", + new String[] {"This Multiblock, depending upon the mode used, can function as a variety of different machines. The idea behind this, was that most of these machines are rather niche compared to any others, as such, not used often.", + "To build, you need to construct a hollow 3x3x3 structure made from Multi-Use casings, With a minimum of 6. Any Casing position can be substituted out with an Input Hatch/Bus, an Output Hatch/Bus, Muffler, Maint. Hatch or Energy Injector Hatch.", + "The Mode can be set by using a Screwdriver on the controller block. Each mode allows the use of Numbered Circuits, to allow a different machine 'type' for each input bus. Mode 3 is currently disabled, as each machine requires special handling.", + "[Metal Work] Mode A - Allows the multiblock to function as a Compressor, a Lathe or an Electro-Magnet. To allow a hatch to run in Compressor mode, insert a No. 20 circuit. For Lathe, use No. 21 and for Electro-Magnet use No. 22.", + "[Fluid Work] Mode B - Allows the multiblock to function as a Fermenter, a Distillery or an Extractor. To allow a hatch to run in Fermenter mode, insert a No. 20 circuit. For Distillery, use No. 21 and for Extractor use No. 22.", + "[Misc. Work] Mode C - Allows the multiblock to function as a Laser Engraver, a Replicator or an Autoclave. To allow a hatch to run in Laser Engraver mode, insert a No. 20 circuit. For Autoclave, use No. 21 and for Replicator use No. 22. REPLICATOR DISABLED.", + }); } - - + + public static ItemStack ItemBookWritten_ThermalBoiler; public static ItemStack ItemBookWritten_ModularBaubles; - public static ItemStack ItemBookWritten_Test; + public static ItemStack ItemBookWritten_MultiPowerStorage; public static ItemStack ItemBookWritten_MultiMachineManual; - + public static void runLater(){ ItemBookWritten_ThermalBoiler = ItemUtils.simpleMetaStack(ModItems.itemCustomBook, 0, 1); ItemBookWritten_ModularBaubles = ItemUtils.simpleMetaStack(ModItems.itemCustomBook, 1, 1); - ItemBookWritten_Test = ItemUtils.simpleMetaStack(ModItems.itemCustomBook, 2, 1); + ItemBookWritten_MultiPowerStorage = ItemUtils.simpleMetaStack(ModItems.itemCustomBook, 2, 1); ItemBookWritten_MultiMachineManual = ItemUtils.simpleMetaStack(ModItems.itemCustomBook, 3, 1); - + //Multiblock Manuals RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{ItemUtils.getSimpleStack(Items.writable_book), ItemUtils.getSimpleStack(Items.lava_bucket)}, ItemBookWritten_ThermalBoiler); RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{ItemUtils.getSimpleStack(Items.writable_book), ItemUtils.getItemStackOfAmountFromOreDict(CI.craftingToolWrench, 1)}, ItemBookWritten_MultiMachineManual); + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{ItemUtils.getSimpleStack(Items.writable_book), ItemUtils.getItemStackOfAmountFromOreDict("wireGt01Tin", 1)}, ItemBookWritten_MultiPowerStorage); } - + private static BookTemplate writeBookTemplate(String aMapping, String aTitle, String aAuthor, String[] aPages){ mBookKeeperCount++; BookTemplate mTemp = new BookTemplate(mBookKeeperCount, aMapping, aTitle, aAuthor, aPages); mBookMap.put(mBookKeeperCount-1, mTemp); return mTemp; } - + public static class BookTemplate { public final int mMeta; public final String mMapping; public final String mTitle; public final String mAuthor; public final String[] mPages; - + BookTemplate(int aMeta, String aMapping, String aTitle, String aAuthor, String[] aPages){ this.mMeta = aMeta; this.mMapping = aMapping; diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index d34e1a1856..ff61834276 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -96,14 +96,14 @@ public class COMPAT_HANDLER { GregtechSemiFluidgenerators.run(); GregtechAdvancedMixer.run(); GregtechWirelessChargers.run(); - GregtechIndustrialGeneratorArray.run(); + //GregtechIndustrialGeneratorArray.run(); GregtechIndustrialCuttingFactory.run(); - GregtechMiniRaFusion.run(); + //GregtechMiniRaFusion.run(); GregtechComponentAssembler.run(); GregtechTeslaTower.run(); GregtechSuperTanks.run(); GregtechIndustrialFishPond.run(); - GregtechTieredChunkloaders.run(); + //GregtechTieredChunkloaders.run(); GregtechIndustrialExtruder.run(); GregtechIndustrialMultiMachine.run(); GregtechBedrockPlatforms.run(); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index bc3e67623d..1c1fa2b53b 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -101,26 +101,25 @@ public class RECIPES_GREGTECH { private static void blastSmelterRecipes() { - /*// Black Bronze - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(13), - ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), }, - FluidUtils.getFluidStack("molten.blackbronze", 5 * 144), 0, MathUtils.findPercentageOfInt(200 * 20, 80), - !CORE.GTNH ? 120 : 480); - - // Black Steel - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(5), - ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 15), - ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3) }, - FluidUtils.getFluidStack("molten.blacksteel", 25 * 144), 0, MathUtils.findPercentageOfInt(60 * 20, 80), - !CORE.GTNH ? 120 : 480); - + if (!CORE.GTNH) { + // Trinium + CORE.RA.addBlastSmelterRecipe( + new ItemStack[] { + ItemUtils.getGregtechCircuit(8), + ELEMENT.getInstance().BISMUTH.getDust(8), + ELEMENT.getInstance().IRON.getDust(64), + ELEMENT.getInstance().CARBON.getDust(16), + ELEMENT.getInstance().GOLD.getDust(16), + ELEMENT.getInstance().SILVER.getDust(16), + ELEMENT.getInstance().OSMIUM.getDust(4), + ELEMENT.getInstance().IRIDIUM.getDust(4), + ELEMENT.getInstance().CERIUM.getDust(8) + }, + FluidUtils.getFluidStack("molten.trinium", 136 * 144), 0, 20 * 3000, + 2040); + } + + /* // Red Steel CORE.RA.addBlastSmelterRecipe( new ItemStack[] { ItemUtils.getGregtechCircuit(6), diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java index dc79b3953b..5db800d82a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java @@ -17,10 +17,12 @@ public class GregtechAdvancedMixer { private static int mID = 851; public static void run(){ - generateMixerRecipeMap(); + //generateMixerRecipeMap(); run1(); } - + + private static GT_Recipe_Map map = GT_Recipe.GT_Recipe_Map.sMixerRecipes; + private static boolean generateMixerRecipeMap(){ if (Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() == 0){ GT_Recipe_Map oldMap = GT_Recipe.GT_Recipe_Map.sMixerRecipes; @@ -45,7 +47,7 @@ public class GregtechAdvancedMixer { private static void run1(){ GregtechItemList.Machine_Advanced_LV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.01", - "Basic Combiner", 1, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Basic Combiner", 1, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), ItemList.Machine_LV_Mixer, Character.valueOf('E'), @@ -54,7 +56,7 @@ public class GregtechAdvancedMixer { GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L)); GregtechItemList.Machine_Advanced_MV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.02", - "Advanced Combiner I", 2, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Advanced Combiner I", 2, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), ItemList.Machine_MV_Mixer, Character.valueOf('E'), @@ -63,7 +65,7 @@ public class GregtechAdvancedMixer { GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L)); GregtechItemList.Machine_Advanced_HV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.03", - "Advanced Combiner II", 3, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Advanced Combiner II", 3, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), ItemList.Machine_HV_Mixer, Character.valueOf('E'), @@ -72,7 +74,7 @@ public class GregtechAdvancedMixer { GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L)); GregtechItemList.Machine_Advanced_EV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.04", - "Super Combiner I", 4, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Super Combiner I", 4, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), ItemList.Machine_EV_Mixer, Character.valueOf('E'), @@ -81,7 +83,7 @@ public class GregtechAdvancedMixer { GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L)); GregtechItemList.Machine_Advanced_IV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.05", - "Super Combiner II", 5, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Super Combiner II", 5, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), ItemList.Machine_IV_Mixer, Character.valueOf('E'), @@ -93,7 +95,7 @@ public class GregtechAdvancedMixer { if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ try { GregtechItemList.Machine_Advanced_LuV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.06", - "Mega Combiner I", 6, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Mega Combiner I", 6, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), //ItemList.Machine_LuV_Mixer, Character.valueOf('E'), @@ -103,7 +105,7 @@ public class GregtechAdvancedMixer { GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L)); GregtechItemList.Machine_Advanced_ZPM_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.07", - "Mega Combiner II", 7, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Mega Combiner II", 7, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), //ItemList.Machine_ZPM_Mixer, Character.valueOf('E'), @@ -113,7 +115,7 @@ public class GregtechAdvancedMixer { GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L)); GregtechItemList.Machine_Advanced_UV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.08", - "Ultra Combiner I", 8, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Ultra Combiner I", 8, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), //ItemList.Machine_UV_Mixer, Character.valueOf('E'), -- cgit From 1c84b53576cc2f918ae4f1bceb4f3cc7362ca122 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 20:11:05 +1000 Subject: + Added book for the FFPP. % More Bookwork. --- src/Java/gtPlusPlus/core/handler/BookHandler.java | 98 ++++++++++++++++++----- 1 file changed, 77 insertions(+), 21 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/handler/BookHandler.java b/src/Java/gtPlusPlus/core/handler/BookHandler.java index 0d8ba21365..06317508db 100644 --- a/src/Java/gtPlusPlus/core/handler/BookHandler.java +++ b/src/Java/gtPlusPlus/core/handler/BookHandler.java @@ -22,6 +22,7 @@ public class BookHandler { public static BookTemplate book_MultiPowerStation; public static BookTemplate book_ModularBauble; public static BookTemplate book_MultiMachineManual; + public static BookTemplate book_NuclearManual; public static void run(){ @@ -29,7 +30,7 @@ public class BookHandler { //Thermal Boiler book_ThermalBoiler = writeBookTemplate( - "Manual_Thermal_Boiler", "Thermal Boiler Manual", "Alkalus", + "Manual_Thermal_Boiler", "Thermal Boiler Manual", "GregoriusT", new String[] { "This Book explains how to set up and run your Thermal Boiler. We are not responsible for any Damage done by this Book itself nor its content.", "First you need to craft the following things for a Thermal Boiler to Function: The Main Boiler Block, 20 Thermal Containment Casings, two Input Hatches, two Output Hatches, a bunch of different Tools and a Maintenance Hatch.", @@ -56,22 +57,25 @@ public class BookHandler { "Power Storage & You [Version 0.64]", "Alkalus", new String[] { - "So, when it comes to power storage you relaly have three Seperate options. \n"+ - "Battery Buffers [GT]\n"+ - "Energy Buffers [GT++]\n"+ - "The Power Sub-Station [GT++]\n", - + //Page 1 + "So, when it comes to power storage you relaly have three seperate options:\n"+ + "\n", + "Battery Buffers,\n"+ + "Energy Buffers,\n"+ + "The Power Sub-Station\n", + //Page 2 "The Battery Buffer" + "\n" + "Is rather portable. Allowing you to throw set one up and insert batteries whevere you need."+"\n"+ "They output 1A for each battery stored inside.", - + //Page 3 "The Energy Buffer" + "\n" + "Is a more optimal choice for storage in your base. Once placed down, they cannot be moved without losing all stored power."+"\n"+ "Energy Buffers can output 4A from the output side, however accept 16A as input.", - + //Page 4 "The Power Sub-Station"+"\n"+ "Is used for storing Insane amounts of power later game."+"\n"+ - "Consumes 2% of the average voltage of all energy type hatches every tick."+"\n"+ + "Consumes 2% of the average voltage of all energy type hatches every tick."+"\n", + //Page 5 "Allows Insertation/Removal of power from the rear face of the controller, swap with a screwdriver."+"\n"+ "Variable Height Structure, between 4-16Y. Inserted Redox Cells dictate max energy tier of structure."+"\n" }); @@ -80,37 +84,87 @@ public class BookHandler { book_ModularBauble = writeBookTemplate( "Manual_Modular_Bauble", "How to: Modular Baubles", "Alkalus", new String[] { - "Concept: This idea came from wanting flexibility. \n", - "First step, Build a Modularity table to begin customisation of your Bauble. \\n" + "Concept: This idea came from wanting flexibility. \n" + + "First step, Build a Modularity table to begin customisation of your Bauble. \n" + " After this has been constructed, you can now combine the upgrades listed within this book to improve the baubles level /100.", - "Defence: \\n" - + " Can be upgraded by combining metal plates with the bauble. \\n" - + " | +1 | Aluminium Plate \\n" - + " | +2 | Stainless Steel Plate \\n" - + " | +3 | Tungsten Plate \\n" - + " | +4 | TungstenSteel Plate \\n" - + " | +5 | Naquadah Plate \\n", - "There was once a sad and lonely oak tree. \\n", + "Defence: \n" + + " Can be upgraded by combining metal plates with the bauble. \n" + + " | +1 | Aluminium Plate \n" + + " | +2 | Stainless Steel Plate \n" + + " | +3 | Tungsten Plate \n" + + " | +4 | TungstenSteel Plate \n" + + " | +5 | Naquadah Plate \n", "There was once a sad and lonely oak tree. \n", - "There was once a sad and lonely oak tree. \\n"}); + "There was once a sad and lonely oak tree. \n", + "There was once a sad and lonely oak tree. \n"}); //Test Novel //20/21/22 book_MultiMachineManual = writeBookTemplate( "Manual_Multi_Machine", "Multi Machine Manual", "Alkalus", - new String[] {"This Multiblock, depending upon the mode used, can function as a variety of different machines. The idea behind this, was that most of these machines are rather niche compared to any others, as such, not used often.", + new String[] { + "This Multiblock, depending upon the mode used, can function as a variety of different machines. The idea behind this, was that most of these machines are rather niche compared to any others, as such, not used often.", "To build, you need to construct a hollow 3x3x3 structure made from Multi-Use casings, With a minimum of 6. Any Casing position can be substituted out with an Input Hatch/Bus, an Output Hatch/Bus, Muffler, Maint. Hatch or Energy Injector Hatch.", "The Mode can be set by using a Screwdriver on the controller block. Each mode allows the use of Numbered Circuits, to allow a different machine 'type' for each input bus. Mode 3 is currently disabled, as each machine requires special handling.", "[Metal Work] Mode A - Allows the multiblock to function as a Compressor, a Lathe or an Electro-Magnet. To allow a hatch to run in Compressor mode, insert a No. 20 circuit. For Lathe, use No. 21 and for Electro-Magnet use No. 22.", "[Fluid Work] Mode B - Allows the multiblock to function as a Fermenter, a Distillery or an Extractor. To allow a hatch to run in Fermenter mode, insert a No. 20 circuit. For Distillery, use No. 21 and for Extractor use No. 22.", "[Misc. Work] Mode C - Allows the multiblock to function as a Laser Engraver, a Replicator or an Autoclave. To allow a hatch to run in Laser Engraver mode, insert a No. 20 circuit. For Autoclave, use No. 21 and for Replicator use No. 22. REPLICATOR DISABLED.", }); + + book_NuclearManual = writeBookTemplate( + "Manual_NuclearStuff_1", "Nuclear Chemistry [FFPP]", "Alkalus", + new String[] { + //Page 1 + "Fission Fuel Processing Plant\n" + + "Size: 3x9x3 [LxHxW]\n" + + "Controller: Center, Bottom\n" + + "\n" + + "4x Input Hatch\n" + + "2x Output Hatch\n" + + "1x Output Bus\n" + + "1x ZPM+ Muffler\n" + + "1x Maintenance Hatch\n" + + "1x Energy Hatch\n" + + "\n" + + "[1] 7x Hastelloy-X or I/O\n" + + "[2] 5x Incoloy-DS Fluid Containment\n" + + "[3] 4x Zeron-100 Shielding\n" + + "[4] 17x Hastelloy-N Sealant Case", + + //Page 2 + "Multiblock Construction\n" + + "Convention is [LxHxW]\n" + + "\n" + + "Layer 1/2:\n" + + "[1][1][1]\n" + + "[1][1][1]\n" + + "[1][1][1]\n" + + "\n" + + "Layer 3/5/6\n" + + "[ ][4][ ]\n" + + "[4][2][4]\n" + + "[ ][4][ ]\n" + + "\n" + + "Layer 4\n" + + "[ ][3][ ]\n" + + "[3][2][3]\n" + + "[ ][3][ ]\n" + + "\n" + + "Layer 7/8/9\n" + + "[ ][ ][ ]\n" + + "[ ][3][ ]\n" + + "[ ][ ][ ]\n" + , + + + }); } public static ItemStack ItemBookWritten_ThermalBoiler; + public static ItemStack ItemBookWritten_NuclearManual; public static ItemStack ItemBookWritten_ModularBaubles; public static ItemStack ItemBookWritten_MultiPowerStorage; public static ItemStack ItemBookWritten_MultiMachineManual; @@ -120,11 +174,13 @@ public class BookHandler { ItemBookWritten_ModularBaubles = ItemUtils.simpleMetaStack(ModItems.itemCustomBook, 1, 1); ItemBookWritten_MultiPowerStorage = ItemUtils.simpleMetaStack(ModItems.itemCustomBook, 2, 1); ItemBookWritten_MultiMachineManual = ItemUtils.simpleMetaStack(ModItems.itemCustomBook, 3, 1); + ItemBookWritten_NuclearManual = ItemUtils.simpleMetaStack(ModItems.itemCustomBook, 4, 1); //Multiblock Manuals RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{ItemUtils.getSimpleStack(Items.writable_book), ItemUtils.getSimpleStack(Items.lava_bucket)}, ItemBookWritten_ThermalBoiler); RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{ItemUtils.getSimpleStack(Items.writable_book), ItemUtils.getItemStackOfAmountFromOreDict(CI.craftingToolWrench, 1)}, ItemBookWritten_MultiMachineManual); RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{ItemUtils.getSimpleStack(Items.writable_book), ItemUtils.getItemStackOfAmountFromOreDict("wireGt01Tin", 1)}, ItemBookWritten_MultiPowerStorage); + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{ItemUtils.getSimpleStack(Items.writable_book), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1)}, ItemBookWritten_NuclearManual); } private static BookTemplate writeBookTemplate(String aMapping, String aTitle, String aAuthor, String[] aPages){ -- cgit From fbc201eeaa38c9cf31c67acec126de40b0f345f6 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 20:25:27 +1000 Subject: % More Book Work. --- src/Java/gtPlusPlus/core/handler/BookHandler.java | 74 +++++++++++++++-------- 1 file changed, 48 insertions(+), 26 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/handler/BookHandler.java b/src/Java/gtPlusPlus/core/handler/BookHandler.java index 06317508db..c8522c8f49 100644 --- a/src/Java/gtPlusPlus/core/handler/BookHandler.java +++ b/src/Java/gtPlusPlus/core/handler/BookHandler.java @@ -58,21 +58,32 @@ public class BookHandler { "Alkalus", new String[] { //Page 1 + " \n"+ + " \n"+ + " \n"+ + " \n"+ + " \n"+ + " \n"+ + " \n"+ + " \n"+ "So, when it comes to power storage you relaly have three seperate options:\n"+ - "\n", + " \n"+ "Battery Buffers,\n"+ "Energy Buffers,\n"+ "The Power Sub-Station\n", //Page 2 - "The Battery Buffer" + "\n" + + "Battery Buffer" + + " \n" + "Is rather portable. Allowing you to throw set one up and insert batteries whevere you need."+"\n"+ "They output 1A for each battery stored inside.", //Page 3 - "The Energy Buffer" + "\n" + + "Energy Buffer" + + " \n" + "Is a more optimal choice for storage in your base. Once placed down, they cannot be moved without losing all stored power."+"\n"+ "Energy Buffers can output 4A from the output side, however accept 16A as input.", //Page 4 - "The Power Sub-Station"+"\n"+ + "The Power Sub-Station"+ + " \n"+ "Is used for storing Insane amounts of power later game."+"\n"+ "Consumes 2% of the average voltage of all energy type hatches every tick."+"\n", //Page 5 @@ -86,14 +97,14 @@ public class BookHandler { new String[] { "Concept: This idea came from wanting flexibility. \n" + "First step, Build a Modularity table to begin customisation of your Bauble. \n" - + " After this has been constructed, you can now combine the upgrades listed within this book to improve the baubles level /100.", - "Defence: \n" - + " Can be upgraded by combining metal plates with the bauble. \n" - + " | +1 | Aluminium Plate \n" - + " | +2 | Stainless Steel Plate \n" - + " | +3 | Tungsten Plate \n" - + " | +4 | TungstenSteel Plate \n" - + " | +5 | Naquadah Plate \n", + + " After this has been constructed, you can now combine the upgrades listed within this book to improve the baubles level/100.", + "Defence:\n" + + "Can be upgraded by combining metal plates with the bauble. \n" + + " | +1 | Aluminium \n" + + " | +2 | Stainless Steel \n" + + " | +3 | Tungsten \n" + + " | +4 | Tungsten Steel \n" + + " | +5 | Naquadah \n", "There was once a sad and lonely oak tree. \n", "There was once a sad and lonely oak tree. \n", "There was once a sad and lonely oak tree. \n"}); @@ -118,24 +129,23 @@ public class BookHandler { "Fission Fuel Processing Plant\n" + "Size: 3x9x3 [LxHxW]\n" + "Controller: Center, Bottom\n" - + "\n" + "4x Input Hatch\n" + "2x Output Hatch\n" + "1x Output Bus\n" + "1x ZPM+ Muffler\n" + "1x Maintenance Hatch\n" - + "1x Energy Hatch\n" - + "\n" - + "[1] 7x Hastelloy-X or I/O\n" + + "1x Energy Hatch\n", + //Page 2 + "[1] 7x Hastelloy-X or I/O\n" + "[2] 5x Incoloy-DS Fluid Containment\n" + "[3] 4x Zeron-100 Shielding\n" - + "[4] 17x Hastelloy-N Sealant Case", - - //Page 2 - "Multiblock Construction\n" - + "Convention is [LxHxW]\n" + + "[4] 17x Hastelloy-N Sealant Case" + "\n" - + "Layer 1/2:\n" + + "Multiblock Construction\n" + + "Convention is [LxHxW]\n" + + "\n", + //Page 3 + "Layer 1/2:\n" + "[1][1][1]\n" + "[1][1][1]\n" + "[1][1][1]\n" @@ -144,8 +154,9 @@ public class BookHandler { + "[ ][4][ ]\n" + "[4][2][4]\n" + "[ ][4][ ]\n" - + "\n" - + "Layer 4\n" + + "\n", + //Page 4 + "Layer 4\n" + "[ ][3][ ]\n" + "[3][2][3]\n" + "[ ][3][ ]\n" @@ -154,8 +165,19 @@ public class BookHandler { + "[ ][ ][ ]\n" + "[ ][3][ ]\n" + "[ ][ ][ ]\n" - , - + , + //Page 5 + " \n"+ + " \n"+ + " \n"+ + " \n"+ + " \n"+ + " \n"+ + " \n"+ + " \n"+ + "Fission Fuel\n"+ + "Processing Plant", + "This structure is used to produce the Molten Salts required to run a Liquid Fluorine Thorium Reactor or LFTR." }); } -- cgit From 4ec6e52b0bb07c2f605212b9bab0b392a71f3147 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 20:27:22 +1000 Subject: % Made all FFPP recipes require/produces 1/10th of the original fluid amounts. --- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 1c1fa2b53b..ef7c0fcc47 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -897,15 +897,15 @@ public class RECIPES_GREGTECH { // FluidStacks // 7LiF - BeF2 - ZrF4 - UF4 - 650C - CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 6500), // Input + CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 650), // Input // A - FluidUtils.getFluidStack(BerylliumFluoride, 2500), // Input + FluidUtils.getFluidStack(BerylliumFluoride, 250), // Input // B - FluidUtils.getFluidStack(ZirconiumFluoride, 800), // Input C - FluidUtils.getFluidStack(UraniumTetraFluoride, 700), // Input + FluidUtils.getFluidStack(ZirconiumFluoride, 80), // Input C + FluidUtils.getFluidStack(UraniumTetraFluoride, 70), // Input // D null, null, null, null, null, // Extra 5 inputs - FluidUtils.getFluidStack(LiFBeF2ZrF4UF4, 10000), // Output + FluidUtils.getFluidStack(LiFBeF2ZrF4UF4, 1000), // Output // Fluid // 1 null, // Output Fluid 2 @@ -913,14 +913,14 @@ public class RECIPES_GREGTECH { 500); // 7LiF - BeF2 - ZrF4 - U235 - 590C - CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 5500), // Input + CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 550), // Input // A - FluidUtils.getFluidStack(BerylliumFluoride, 1500), // Input + FluidUtils.getFluidStack(BerylliumFluoride, 150), // Input // B - FluidUtils.getFluidStack(ZirconiumFluoride, 600), // Input C - FluidUtils.getFluidStack(Uranium235, 2400), // Input D + FluidUtils.getFluidStack(ZirconiumFluoride, 60), // Input C + FluidUtils.getFluidStack(Uranium235, 240), // Input D null, null, null, null, null, // Extra 5 inputs - FluidUtils.getFluidStack(LiFBeF2ZrF4U235, 10000), // Output + FluidUtils.getFluidStack(LiFBeF2ZrF4U235, 1000), // Output // Fluid // 1 null, // Output Fluid 2 @@ -928,15 +928,15 @@ public class RECIPES_GREGTECH { 500); // 7liF - BeF2 - ThF4 - UF4 - 566C - CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 6200), // Input + CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 620), // Input // A - FluidUtils.getFluidStack(BerylliumFluoride, 2800), // Input + FluidUtils.getFluidStack(BerylliumFluoride, 280), // Input // B - FluidUtils.getFluidStack(ThoriumFluoride, 700), // Input C - FluidUtils.getFluidStack(UraniumTetraFluoride, 700), // Input + FluidUtils.getFluidStack(ThoriumFluoride, 70), // Input C + FluidUtils.getFluidStack(UraniumTetraFluoride, 70), // Input // D null, null, null, null, null, // Extra 5 inputs - FluidUtils.getFluidStack(LiFBeF2ThF4UF4, 10000), // Output + FluidUtils.getFluidStack(LiFBeF2ThF4UF4, 1000), // Output // Fluid // 1 null, // Output Fluid 2 -- cgit From 74cbb7d6c9dd8b2cf3d856d9483b464dbdd3a4e1 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 21:15:42 +1000 Subject: % Book Formatting. $ Fixed some chemical processing recipes. --- src/Java/gtPlusPlus/core/handler/BookHandler.java | 17 +++-------------- src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 18 +++++++++++------- 2 files changed, 14 insertions(+), 21 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/handler/BookHandler.java b/src/Java/gtPlusPlus/core/handler/BookHandler.java index c8522c8f49..e3789d5a6f 100644 --- a/src/Java/gtPlusPlus/core/handler/BookHandler.java +++ b/src/Java/gtPlusPlus/core/handler/BookHandler.java @@ -62,10 +62,6 @@ public class BookHandler { " \n"+ " \n"+ " \n"+ - " \n"+ - " \n"+ - " \n"+ - " \n"+ "So, when it comes to power storage you relaly have three seperate options:\n"+ " \n"+ "Battery Buffers,\n"+ @@ -167,17 +163,10 @@ public class BookHandler { + "[ ][ ][ ]\n" , //Page 5 - " \n"+ - " \n"+ - " \n"+ - " \n"+ - " \n"+ - " \n"+ - " \n"+ - " \n"+ "Fission Fuel\n"+ - "Processing Plant", - "This structure is used to produce the Molten Salts required to run a Liquid Fluorine Thorium Reactor or LFTR." + "Processing Plant"+ + "----------------------\n"+ + "This structure is used to produce the Molten Salts required to run a Liquid Fluorine Thorium Reactor [LFTR]." }); } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index ef7c0fcc47..ac3ca48167 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -974,23 +974,23 @@ public class RECIPES_GREGTECH { addAR(T1, ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 4), FluidUtils.getFluidStack("nitrogen", 2000), - T2, 128, 2000); + T2, 120, 2000); addAR(T2, ItemUtils.getItemStackOfAmountFromOreDict("plateTitanium", 4), FluidUtils.getFluidStack("helium", 2000), - T3, 256, 8000); + T3, 250, 8000); addAR(T3, ItemUtils.getItemStackOfAmountFromOreDict("plateTungsten", 4), FluidUtils.getFluidStack("argon", 4000), - T4, 512, 32000); + T4, 500, 32000); addAR(T4, ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 4), FluidUtils.getFluidStack("radon", 4000), - T5, 1024, 128000); + T5, 1000, 128000); addAR(T5, ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 4), - FluidUtils.getFluidStack("krypton", 500), - T6, 2048, 512000); + FluidUtils.getFluidStack("molten.krypton", 500), + T6, 2000, 512000); /*addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, @@ -1088,8 +1088,12 @@ public class RECIPES_GREGTECH { } private static void fluidExtractorRecipes() { + //Ender Fluid GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getSimpleStack(Items.ender_pearl), null, - FluidUtils.getFluidStack("ender", 250), 10000, 100, 30); + FluidUtils.getFluidStack("ender", 250), 10000, 100, 30); + //FLiBe fuel + GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 1), null, + FluidUtils.getFluidStack("molten.li2bef4", 144), 10000, 100, 500); } private static void chemicalBathRecipes() { -- cgit From cc960c4aa3697b9f47f1ca050511f5d2a94e63f2 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sun, 13 May 2018 01:03:38 +1000 Subject: + Added Turbine Animations. $ Fixed Large Auto-Assembler Name. $ Possible fix for #239. $ Other Bug Fixes. $ Fixed Old School Circuits breaking Integrated Circuit Recipes. % Made Adv. EBF. Use new casing textures. % Streamlined Old School Circuit function call locations to a single handler. % Cleaned up ASM Logging. --- src/Java/gtPlusPlus/core/common/CommonProxy.java | 8 ++--- .../gtPlusPlus/core/handler/OldCircuitHandler.java | 11 +++++-- src/Java/gtPlusPlus/core/item/ModItems.java | 4 +++ .../core/recipe/RECIPES_Old_Circuits.java | 12 +++---- src/Java/gtPlusPlus/core/recipe/common/CI.java | 4 +-- .../gtPlusPlus/preloader/Preloader_GT_OreDict.java | 22 ++++++++++--- .../common/blocks/textures/TexturesGtBlock.java | 2 ++ .../common/items/MetaGeneratedGregtechItems.java | 35 ++++++++++++--------- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 11 +++++++ .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 11 +++++++ .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 26 +++++++-------- .../multi/production/GT4Entity_AutoCrafter.java | 20 ++++++------ .../registration/gregtech/Gregtech4Content.java | 2 +- .../blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png | Bin 0 -> 1762 bytes .../iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta | 5 +++ .../blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png | Bin 0 -> 1762 bytes .../iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta | 5 +++ .../TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png | Bin 0 -> 1762 bytes .../STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta | 5 +++ 19 files changed, 120 insertions(+), 63 deletions(-) create mode 100644 src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png create mode 100644 src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta create mode 100644 src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png create mode 100644 src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png create mode 100644 src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index 4d32d66ecd..8a1ef34b68 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -78,6 +78,8 @@ public class CommonProxy { CI.preInit(); AddToCreativeTab.initialiseTabs(); + + COMPAT_IntermodStaging.preInit(); BookHandler.run(); //Registration of entities and renderers @@ -135,12 +137,6 @@ public class CommonProxy { Logger.INFO("Cleaning up, doing postInit."); PlayerCache.initCache(); - //Circuits - if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - RECIPES_Old_Circuits.handleCircuits(); - new RECIPES_Old_Circuits(); - } - //Make Burnables burnable if (!CORE.burnables.isEmpty()){ BurnableFuelHandler fuelHandler = new BurnableFuelHandler(); diff --git a/src/Java/gtPlusPlus/core/handler/OldCircuitHandler.java b/src/Java/gtPlusPlus/core/handler/OldCircuitHandler.java index 5105177cc2..9e310aa767 100644 --- a/src/Java/gtPlusPlus/core/handler/OldCircuitHandler.java +++ b/src/Java/gtPlusPlus/core/handler/OldCircuitHandler.java @@ -14,13 +14,15 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.recipe.RECIPES_Old_Circuits; import gtPlusPlus.core.util.reflect.ReflectionUtils; +import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; public class OldCircuitHandler { public static void preInit(){ if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - removeCircuitRecipeMap(); //Bye shitty recipes. + removeCircuitRecipeMap(); //Bye shitty recipes. } } @@ -29,7 +31,12 @@ public class OldCircuitHandler { } public static void postInit(){ - + RECIPES_Old_Circuits.handleCircuits(); + new RECIPES_Old_Circuits(); + } + + public static boolean addCircuitItems() { + return MetaGeneratedGregtechItems.INSTANCE.registerOldCircuits(); } private static boolean removeCircuitRecipeMap(){ diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 657c8f25ee..0f7c28d98d 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -18,6 +18,7 @@ import gtPlusPlus.core.block.base.BlockBaseModular; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.common.compat.COMPAT_Baubles; import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.handler.OldCircuitHandler; import gtPlusPlus.core.item.base.*; import gtPlusPlus.core.item.base.foil.BaseItemFoil; import gtPlusPlus.core.item.base.foods.BaseItemFood; @@ -55,6 +56,7 @@ import gtPlusPlus.core.util.debug.DEBUG_INIT; import gtPlusPlus.core.util.minecraft.*; import gtPlusPlus.everglades.GTplusplus_Everglades; import gtPlusPlus.xmod.eio.material.MaterialEIO; +import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -277,6 +279,8 @@ public final class ModItems { itemDebugAreaClear = new ItemAreaClear(); + //Register meta item, because we need them for everything. + MetaGeneratedGregtechItems.INSTANCE.generateMetaItems(); //Some Simple forms of materials itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber"); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java index ddce7aec5b..dbdf6b1437 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java @@ -97,7 +97,6 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { } public static boolean handleCircuits(){ - hideCircuitsNEI(); addCircuitRecipes(); removeNewCircuits(); @@ -120,10 +119,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { boolean newVersion = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() >= 30; setItemList(ItemList.Circuit_Primitive, GregtechItemList.Old_Circuit_Primitive); - setItemList(ItemList.Circuit_Basic, GregtechItemList.Old_Circuit_Basic); - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Integrated_Good"), GregtechItemList.Old_Circuit_Good); //New - } + setItemList(ItemList.Circuit_Basic, GregtechItemList.Old_Circuit_Basic); setItemList(ItemList.Circuit_Good, GregtechItemList.Old_Circuit_Good); setItemList(ItemList.Circuit_Advanced, GregtechItemList.Old_Circuit_Advanced); //ItemList.Circuit_Data, GregtechItemList.Old_Circuit_Data); @@ -141,7 +137,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { } //Good if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Integrated"), GregtechItemList.Old_Circuit_Good); + setItemList(ItemList.valueOf("Circuit_Integrated_Good"), GregtechItemList.Old_Circuit_Good); //New } //Advanced if (newVersion) { @@ -310,7 +306,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { //remove a few recipes - GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32070", 32070, 1)); + /*GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32070", 32070, 1)); GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32069", 32069, 1)); if (LoadedMods.Extra_Utils){ ItemStack EQU = ItemUtils.simpleMetaStack("ExtraUtilities:enderQuarryUpgrade", 0, 1); @@ -345,7 +341,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { 80*20, 2); } - } + }*/ return true; } diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index 1f06c5befb..7ad7820985 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -179,9 +179,7 @@ public class CI { public static ItemStack explosiveITNT; public static void preInit(){ - //Put these here, because we need them for everything. - new MetaGeneratedGregtechItems(); - + //Tiered Components component_Plate = new String[]{ getTieredComponent(OrePrefixes.plate, 0), diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java index f33c0a029d..c3a1f23f53 100644 --- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java +++ b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java @@ -14,11 +14,14 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class Preloader_GT_OreDict { public static boolean shouldPreventRegistration(final String string, final ItemStack bannedItem) { - - if (bannedItem == null || (!CORE_Preloader.enableOldGTcircuits && !LoadedMods.Mekanism)) { + + if (bannedItem == null) { + return false; + } + else if (!CORE_Preloader.enableOldGTcircuits && !LoadedMods.Mekanism){ return false; } - + try { if (CORE_Preloader.enableOldGTcircuits){ if ((bannedItem != null) && ItemUtils.getModId(bannedItem).toLowerCase().equals("gregtech")){ @@ -145,8 +148,19 @@ public class Preloader_GT_OreDict { FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "A mod tried to register an invalid item with the OreDictionary."); if (bannedItem != null){ FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Please report this issue to the authors of %s", ItemUtils.getModId(bannedItem)); + try { + if (bannedItem.getItemDamage() <= Short.MAX_VALUE-1) { + FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Item was not null, but still invalidly registering: %s", bannedItem.getDisplayName() != null ? bannedItem.getDisplayName() : "INVALID ITEM FOUND"); + } + else { + FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Item was not null, but still invalidly registering: %s", "Found Wildcard item that is being registered too early."); + } + } + catch (Exception h) { + h.printStackTrace(); + } } - FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "%s", e.getMessage()); + //FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "%s", e.getMessage()); } return false; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index ea4e003988..fd46c6d0eb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -219,6 +219,8 @@ public class TexturesGtBlock { public static final CustomIcon Overlay_Machine_Vent_Fast = Internal_Overlay_Machine_Vent_Fast; private static final CustomIcon Internal_Overlay_Machine_Vent_Adv = new CustomIcon("TileEntities/adv_machine_vent_rotating"); public static final CustomIcon Overlay_Machine_Vent_Adv = Internal_Overlay_Machine_Vent_Adv; + private static final CustomIcon Internal_Overlay_Machine_Turbine_Active = new CustomIcon("TileEntities/STEAM_TURBINE_SIDE_ACTIVE"); + public static final CustomIcon Overlay_Machine_Turbine_Active = Internal_Overlay_Machine_Turbine_Active; //Grate Texture public static final CustomIcon OVERLAY_GRATE_A = new CustomIcon("metro/OVERLAY_GRATE_A"); //Speaker Texture diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index aa3403301a..00511d4c8b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -17,6 +17,7 @@ import gregtech.common.items.behaviors.Behaviour_DataOrb; import gregtech.common.items.behaviors.Behaviour_DataStick; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.handler.OldCircuitHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; @@ -28,13 +29,22 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32; public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { - public MetaGeneratedGregtechItems INSTANCE; + + public final static MetaGeneratedGregtechItems INSTANCE; + + static { + INSTANCE = new MetaGeneratedGregtechItems(); + } public MetaGeneratedGregtechItems() { - super("MU-metaitem.01", new OrePrefixes[]{null}); - this.INSTANCE = this; - int tLastID = 0; + super("MU-metaitem.01", new OrePrefixes[]{null}); + } + public void generateMetaItems() { + int tLastID = 0; + + OldCircuitHandler.addCircuitItems(); + if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ Logger.INFO("Gregtech 5.09 not found, using fallback components. (I like how I have to add compat to something I added first and had stolen.)"); GregtechItemList.Electric_Pump_LuV.set(this.addItem(tLastID = 0, "Electric Pump (LuV)", "163920 L/sec (as Cover)", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)})); @@ -159,10 +169,10 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { //Extruder Shape GregtechItemList.Shape_Extruder_WindmillShaft.set(this.addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts", new Object[0])); - + //GTNH Already adds this. if (!CORE.GTNH) - GregtechItemList.Shape_Extruder_SmallGear.set(this.addItem(221, "Extruder Shape (Small Gear)", "Extruder Shape for making small gears", new Object[0])); + GregtechItemList.Shape_Extruder_SmallGear.set(this.addItem(221, "Extruder Shape (Small Gear)", "Extruder Shape for making small gears", new Object[0])); //Batteries @@ -178,7 +188,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { /** * Power Gems */ - + GregtechItemList.Battery_Gem_1.set(this.addItem(tLastID = 66, "Fission Power Cell", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 8L), getTcAspectStack(TC_Aspects.METALLUM, 24L), getTcAspectStack(TC_Aspects.POTENTIA, 16L)})); this.setElectricStats(32000 + tLastID, 32000000L, GT_Values.V[5], 5L, -3L, false); GregtechItemList.Battery_Gem_2.set(this.addItem(tLastID = 68, "Fusion Power Cell", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 16L), getTcAspectStack(TC_Aspects.METALLUM, 32L), getTcAspectStack(TC_Aspects.POTENTIA, 32L)})); @@ -188,8 +198,8 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { //ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_1.get(1), "batteryFutureBasic"); //ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_2.get(1), "batteryFutureGood"); //ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_3.get(1), "batteryFutureAdvanced"); - - + + /*GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Acid Battery", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, 1L), getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, -3L, true); @@ -248,11 +258,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { //FOOOOOOOOOOOOOOD GregtechItemList.Food_Baked_Raisin_Bread.set(this.addItem(tLastID = 60, "Raisin Bread", "Extra Raisins, Just for ImQ009", new Object[]{new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), getTcAspectStack(TC_Aspects.CORPUS, 1L), getTcAspectStack(TC_Aspects.FAMES, 1L), getTcAspectStack(TC_Aspects.IGNIS, 1L)})); - //Old Circuits - if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - registerOldCircuits(); - } - if (!CORE.GTNH) { GregtechItemList.Fluid_Cell_144L.set(this.addItem(tLastID = 61, "144L Invar Fluid Cell", "Holds exactly one dust worth of liquid.", new Object[]{new ItemData(Materials.Invar, (OrePrefixes.plate.mMaterialAmount * 8L) + (4L * OrePrefixes.ring.mMaterialAmount), new MaterialStack[0]), getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L)})); this.setFluidContainerStats(32000 + tLastID, 144L, 64L); @@ -317,7 +322,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { return true; } - private boolean registerOldCircuits(){ + public boolean registerOldCircuits(){ //Enable Old Circuits Logger.INFO("[Old Feature - Circuits] Enabling Pre-5.09.28 Circuits and Data Storage."); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java index cc56ef947c..c53436b059 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java @@ -2,11 +2,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.common.tileentities.generators.GT_MetaTileEntity_GasTurbine; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; + public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbine { public GT_MetaTileEntity_ULV_GasTurbine(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); @@ -29,4 +33,11 @@ public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbi public void onConfigLoad() { this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, 95); } + + @Override + public ITexture[] getSidesActive(final byte aColor) { + return new ITexture[]{super.getSidesActive(aColor)[0], + new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)}; + } + } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java index 7184177d20..11bdc01823 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java @@ -2,11 +2,16 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.common.tileentities.generators.GT_MetaTileEntity_SteamTurbine; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; + public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamTurbine { public GT_MetaTileEntity_ULV_SteamTurbine(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); @@ -30,4 +35,10 @@ public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamT public void onConfigLoad() { this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SteamTurbine.efficiency.tier." + this.mTier, 6 + 1); } + + @Override + public ITexture[] getSidesActive(final byte aColor) { + return new ITexture[]{super.getSidesActive(aColor)[0], + new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)}; + } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index a8482960d0..8fa9beac33 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -16,6 +16,7 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; @@ -41,16 +42,16 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase public GregtechMetaTileEntity_Adv_EBF(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); - CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10); + CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 11); mHotFuelName = FluidUtils.getFluidStack("pyrotheum", 1).getLocalizedName(); - mCasingName = GregtechItemList.Casing_AdvancedVacuum.get(1).getDisplayName(); + mCasingName = GregtechItemList.Casing_Adv_BlastFurnace.get(1).getDisplayName(); } public GregtechMetaTileEntity_Adv_EBF(String aName) { super(aName); - CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10); + CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 11); mHotFuelName = FluidUtils.getFluidStack("pyrotheum", 1).getLocalizedName(); - mCasingName = GregtechItemList.Casing_AdvancedVacuum.get(1).getDisplayName(); + mCasingName = GregtechItemList.Casing_Adv_BlastFurnace.get(1).getDisplayName(); } public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { @@ -79,9 +80,9 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[11], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[CASING_TEXTURE_ID], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)}; } - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[11]}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[CASING_TEXTURE_ID]}; } public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { @@ -116,7 +117,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase if (!aBaseMetaTileEntity.getAirOffset(xDir, 2, zDir)) { return false; } - if (!addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 3, zDir), 11)) { + if (!addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 3, zDir), CASING_TEXTURE_ID)) { return false; } byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 2, zDir); @@ -160,8 +161,8 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { return false; } - if (!addOutputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 3, zDir + j), 11)) { - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 3, zDir + j) != GregTech_API.sBlockCasings1) { + if (!addOutputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 3, zDir + j), CASING_TEXTURE_ID)) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 3, zDir + j) != ModBlocks.blockCasings3Misc) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 3, zDir + j) != 11) { @@ -175,8 +176,8 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase for (int j = -1; j < 2; j++) { if ((xDir + i != 0) || (zDir + j != 0)) { IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 0, zDir + j); - if ((!addMaintenanceToMachineList(tTileEntity, 11)) && (!addInputToMachineList(tTileEntity, 11)) && (!addOutputToMachineList(tTileEntity, 11)) && (!addEnergyInputToMachineList(tTileEntity, 11))) { - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j) != GregTech_API.sBlockCasings1) { + if ((!addMaintenanceToMachineList(tTileEntity, CASING_TEXTURE_ID)) && (!addInputToMachineList(tTileEntity, CASING_TEXTURE_ID)) && (!addOutputToMachineList(tTileEntity, CASING_TEXTURE_ID)) && (!addEnergyInputToMachineList(tTileEntity, CASING_TEXTURE_ID))) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j) != ModBlocks.blockCasings3Misc) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 0, zDir + j) != 11) { @@ -247,8 +248,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase @Override public boolean hasSlotInGUI() { - // TODO Auto-generated method stub - return false; + return true; } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java index 4c9f83b19f..2ffe6c5121 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java @@ -152,6 +152,7 @@ extends GT_MetaTileEntity_MultiBlockBase "1x Muffler Hatch", "1x Maintenance Hatch", "1x Energy Hatch", + "Rest is Autocrafter Frame", "--------------------------------------", CORE.GT_Tooltip }; @@ -366,26 +367,23 @@ extends GT_MetaTileEntity_MultiBlockBase } } } + if (this.mTier > 5) { this.mMaxProgresstime >>= this.mTier - 5; } - if (this.mMaxProgresstime <= 20) { - return false; - } - else { - inputItem.stackSize--; - if (inputItem.stackSize <= 0){ - tInputs[0] = null; - } - this.updateSlots(); - return true; + inputItem.stackSize--; + if (inputItem.stackSize <= 0){ + tInputs[0] = null; } + this.updateSlots(); + return true; + } } } return false; } - + private boolean doesCrafterHave9SlotInput(){ GT_MetaTileEntity_Hatch_InputBus craftingInput = null; if (!this.mInputBusses.isEmpty()){ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index ed37d901ad..7bee8f41d5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -75,6 +75,6 @@ public class Gregtech4Content { // Gregtech 4 Multiblock Auto-Crafter Logger.INFO("Gregtech 4 Content | Registering Multiblock Crafter."); GregtechItemList.GT4_Multi_Crafter.set( - new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Scale Auto-Asesembler v1.01").getStackForm(1L)); + new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Scale Auto-Assembler v1.01").getStackForm(1L)); } } diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png b/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png new file mode 100644 index 0000000000..79d89094a5 Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..dfae8cae16 --- /dev/null +++ b/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} \ No newline at end of file diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png b/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png new file mode 100644 index 0000000000..79d89094a5 Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..dfae8cae16 --- /dev/null +++ b/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} \ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png new file mode 100644 index 0000000000..79d89094a5 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..dfae8cae16 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} \ No newline at end of file -- cgit From ab4b246c65795d612d35a8ace09acfe53e4580b4 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sun, 13 May 2018 02:47:16 +1000 Subject: + Added a recipe to turn Ethylbenzene into Styrene and Hydrogen. - Removed ASM logging, unless Hidden NEI entries are shown. $ Hopefully fixes lots of Dehydrator recipes that may not have been working. --- build.gradle | 4 +- src/Java/gtPlusPlus/core/lib/CORE.java | 2 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 471 +++++++++++---------- .../gtPlusPlus/preloader/Preloader_GT_OreDict.java | 3 + src/resources/mcmod.info | 2 +- 5 files changed, 247 insertions(+), 235 deletions(-) (limited to 'src/Java') diff --git a/build.gradle b/build.gradle index aa81e27e60..764a23d9b5 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ configurations { } dependencies { - compile files('mods/gregtech_1.7.10-5.08.33.jar') + compile files('mods/gregtech-5.09.32-dev.jar') compile files('mods/industrialcraft-2-2.2.720-experimental-dev.jar') compile fileTree(dir: 'libs', include: '*.jar') fatJar files('libs/Segment-2.1.1.jar') @@ -45,7 +45,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 archivesBaseName = "GT-PlusPlus" -version = "1.7.0-prerelease-11-final" +version = "1.7.0-prerelease-14-final" minecraft.version = "1.7.10-10.13.4.1614-1.7.10" diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 93f40ef737..ed5c7fa90b 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -48,7 +48,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.7.0-prerelease-11-final"; + public static final String VERSION = "1.7.0-prerelease-14-final"; public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); public static String USER_COUNTRY = GeoUtils.determineUsersCountry(); public static boolean isModUpToDate = Utils.isModUpToDate(); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index ac3ca48167..d2732cac86 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -16,7 +16,6 @@ import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.AddGregtechRecipe; @@ -33,7 +32,6 @@ public class RECIPES_GREGTECH { private static void execute() { cokeOvenRecipes(); electrolyzerRecipes(); - // matterFabRecipes(); assemblerRecipes(); fluidcannerRecipes(); distilleryRecipes(); @@ -114,11 +112,11 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().OSMIUM.getDust(4), ELEMENT.getInstance().IRIDIUM.getDust(4), ELEMENT.getInstance().CERIUM.getDust(8) - }, + }, FluidUtils.getFluidStack("molten.trinium", 136 * 144), 0, 20 * 3000, 2040); } - + /* // Red Steel CORE.RA.addBlastSmelterRecipe( @@ -173,7 +171,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("ingotSteel", 1) }, FluidUtils.getFluidStack("molten.tungstensteel", 2 * 144), 0, MathUtils.findPercentageOfInt(75 * 20, 80), 480); - + // HSS-G CORE.RA.addBlastSmelterRecipe( new ItemStack[] { ItemUtils.getGregtechCircuit(14), @@ -258,7 +256,7 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("molten.tungstencarbide", 2 * 144), 0, MathUtils.findPercentageOfInt( (int) Math.max(Materials.get("TungstenCarbide").getMass() / 40L, 1L) - * Materials.get("TungstenCarbide").mBlastFurnaceTemp, + * Materials.get("TungstenCarbide").mBlastFurnaceTemp, 80), 480); } @@ -271,7 +269,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 3) }, FluidUtils.getFluidStack("molten.vanadiumgallium", 4 * 144), 0, MathUtils.findPercentageOfInt((int) Math.max(Materials.VanadiumGallium.getMass() / 40L, 1L) - * Materials.VanadiumGallium.mBlastFurnaceTemp, 80), + * Materials.VanadiumGallium.mBlastFurnaceTemp, 80), 480); } @@ -560,232 +558,243 @@ public class RECIPES_GREGTECH { } catch (final NullPointerException e) { Logger.INFO("[dustCalciumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } + } - // 2 LiOH + CaCO3 - try { + } - CORE.RA.addDehydratorRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) }, // Item - // input - // (Array, - // up - // to - // 2) - null, // Fluid input (slot 1) - null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, - new int[] { 0 }, 120 * 20, // Time in ticks - 1000); // EU + // Process Waste Water + try { - } - catch (final NullPointerException e) { - Logger.INFO("[dustLi2CO3CaOH2] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } + CORE.RA.addDehydratorRecipe(null, // Item input (Array, up to 2) + FluidUtils.getFluidStack("sludge", 1000), // Fluid input + // (slot 1) + FluidUtils.getFluidStack("nitricacid", 10), // Fluid + // output + // (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 }, 2 * 20, // Time + // in + // ticks + 500); // EU - // LiOH Liquid to Dust - try { + } + catch (final NullPointerException e) { + Logger.INFO("[sludge] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } - CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getGregtechCircuit(0) }, // Item - // input - // (Array, - // up - // to - // 2) - FluidUtils.getFluidStack("lithiumhydroxide", 144), // Fluid - // input - // (slot - // 1) - null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, - new int[] { 0 }, 1 * 20, // Time in ticks - 64); // EU - } - catch (final NullPointerException e) { - Logger.INFO("[dustLithiumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - // Zirconium Chloride -> TetraFluoride - try { + // 2 LiOH + CaCO3 + try { - CORE.RA.addDehydratorRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 9) }, // Item - // input - // (Array, - // up - // to - // 2) - FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), // Fluid - // input - // (slot - // 1) - null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9), - ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, - new int[] { 0 }, 120 * 20, // Time in ticks - 500); // EU + CORE.RA.addDehydratorRecipe( + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) }, // Item + // input + // (Array, + // up + // to + // 2) + null, // Fluid input (slot 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0 }, 120 * 20, // Time in ticks + 1000); // EU - } - catch (final NullPointerException e) { - Logger.INFO("[dustZrF4] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } + } + catch (final NullPointerException e) { + Logger.INFO("[dustLi2CO3CaOH2] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } - // CaF2 + H2SO4 → CaSO4(solid) + 2 HF - try { + // LiOH Liquid to Dust + try { - CORE.RA.addDehydratorRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 16) }, // Item - // input - // (Array, - // up - // to - // 2) - FluidUtils.getFluidStack("sulfuricacid", 56 * 144), // Fluid - // input - // (slot - // 1) - null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, - new int[] { 0, 0, 100, 100, 300, 200 }, 10 * 60 * 20, // Time - // in - // ticks - 230); // EU + CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getGregtechCircuit(0) }, // Item + // input + // (Array, + // up + // to + // 2) + FluidUtils.getFluidStack("lithiumhydroxide", 144), // Fluid + // input + // (slot + // 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0 }, 1 * 20, // Time in ticks + 64); // EU - } - catch (final NullPointerException e) { - Logger.INFO("[dustFluorite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } + } + catch (final NullPointerException e) { + Logger.INFO("[dustLithiumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } - // Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O - try { - CORE.RA.addDehydratorRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2), - ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4) }, // Item - // input - // (Array, - // up - // to - // 2) - null, // Fluid input (slot 1) - FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), // Fluid - // output - // (slot - // 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, - new int[] { 0, 0, 0 }, 32 * 20, // Time in ticks - 64); // EU + // Zirconium Chloride -> TetraFluoride + try { - } - catch (final NullPointerException e) { - Logger.INFO("[ammoniumtetrafluoroberyllate] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } + CORE.RA.addDehydratorRecipe( + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 9) }, // Item + // input + // (Array, + // up + // to + // 2) + FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), // Fluid + // input + // (slot + // 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9), + ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0 }, 120 * 20, // Time in ticks + 500); // EU - // (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2 - try { - CORE.RA.addDehydratorRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 5) }, // Item - // input - // (Array, - // up - // to - // 2) - FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), // Fluid - // input - // (slot - // 1) - null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), - ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, - new int[] { 0, 0, 0 }, 5 * 60 * 20, // Time in ticks - 120); // EU + } + catch (final NullPointerException e) { + Logger.INFO("[dustZrF4] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } - } - catch (final NullPointerException e) { - Logger.INFO("[cellBerylliumFluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } + // CaF2 + H2SO4 → CaSO4(solid) + 2 HF + try { - // Process Waste Water - try { + CORE.RA.addDehydratorRecipe( + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 16) }, // Item + // input + // (Array, + // up + // to + // 2) + FluidUtils.getFluidStack("sulfuricacid", 56 * 144), // Fluid + // input + // (slot + // 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16), + ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0, 0, 100, 100, 300, 200 }, 10 * 60 * 20, // Time + // in + // ticks + 230); // EU - CORE.RA.addDehydratorRecipe(null, // Item input (Array, up to 2) - FluidUtils.getFluidStack("sludge", 1000), // Fluid input - // (slot 1) - FluidUtils.getFluidStack("nitricacid", 10), // Fluid - // output - // (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, - new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 }, 2 * 20, // Time - // in - // ticks - 500); // EU + } + catch (final NullPointerException e) { + Logger.INFO("[dustFluorite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } - } - catch (final NullPointerException e) { - Logger.INFO("[sludge] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } + // Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O + try { + CORE.RA.addDehydratorRecipe( + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2), + ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4) }, // Item + // input + // (Array, + // up + // to + // 2) + null, // Fluid input (slot 1) + FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), // Fluid + // output + // (slot + // 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0, 0, 0 }, 32 * 20, // Time in ticks + 64); // EU } + catch (final NullPointerException e) { + Logger.INFO("[ammoniumtetrafluoroberyllate] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + + // (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2 + try { + CORE.RA.addDehydratorRecipe( + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 5) }, // Item + // input + // (Array, + // up + // to + // 2) + FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), // Fluid + // input + // (slot + // 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), + ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0, 0, 0 }, 5 * 60 * 20, // Time in ticks + 120); // EU + + } + catch (final NullPointerException e) { + Logger.INFO("[cellBerylliumFluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + + // Makes Styrene + CORE.RA.addDehydratorRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 4), // Item Input + FluidUtils.getFluidStack("fluid.ethylbenzene", 4000), // Fluid / + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellStyrene", 3), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1) }, // Output + 3 * 20, // Time in ticks + 30); // EU } @@ -962,7 +971,7 @@ public class RECIPES_GREGTECH { addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1), ItemUtils.getItemStackOfAmountFromOreDict("plateLead", 4), FluidUtils.getFluidStack("oxygen", 1000), ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 240); - + //Tier 2-6 ItemStack T1 = GregtechItemList.Casing_Vanadium_Redox.get(1); ItemStack T2 = GregtechItemList.Casing_Vanadium_Redox_IV.get(1); @@ -970,28 +979,28 @@ public class RECIPES_GREGTECH { ItemStack T4 = GregtechItemList.Casing_Vanadium_Redox_ZPM.get(1); ItemStack T5 = GregtechItemList.Casing_Vanadium_Redox_UV.get(1); ItemStack T6 = GregtechItemList.Casing_Vanadium_Redox_MAX.get(1); - + addAR(T1, - ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 4), - FluidUtils.getFluidStack("nitrogen", 2000), - T2, 120, 2000); + ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 4), + FluidUtils.getFluidStack("nitrogen", 2000), + T2, 120, 2000); addAR(T2, - ItemUtils.getItemStackOfAmountFromOreDict("plateTitanium", 4), - FluidUtils.getFluidStack("helium", 2000), - T3, 250, 8000); + ItemUtils.getItemStackOfAmountFromOreDict("plateTitanium", 4), + FluidUtils.getFluidStack("helium", 2000), + T3, 250, 8000); addAR(T3, - ItemUtils.getItemStackOfAmountFromOreDict("plateTungsten", 4), - FluidUtils.getFluidStack("argon", 4000), - T4, 500, 32000); + ItemUtils.getItemStackOfAmountFromOreDict("plateTungsten", 4), + FluidUtils.getFluidStack("argon", 4000), + T4, 500, 32000); addAR(T4, - ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 4), - FluidUtils.getFluidStack("radon", 4000), - T5, 1000, 128000); + ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 4), + FluidUtils.getFluidStack("radon", 4000), + T5, 1000, 128000); addAR(T5, - ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 4), - FluidUtils.getFluidStack("molten.krypton", 500), - T6, 2000, 512000); - + ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 4), + FluidUtils.getFluidStack("molten.krypton", 500), + T6, 2000, 512000); + /*addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);*/ @@ -1270,7 +1279,7 @@ public class RECIPES_GREGTECH { private static void macerationRecipes() { GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1)); - + GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 9)); /* diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java index c3a1f23f53..2dcbe46056 100644 --- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java +++ b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import gregtech.common.items.GT_MetaGenerated_Item_01; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -145,6 +146,7 @@ public class Preloader_GT_OreDict { } } catch (final Throwable e) { + if (CORE.ConfigSwitches.showHiddenNEIItems) { FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "A mod tried to register an invalid item with the OreDictionary."); if (bannedItem != null){ FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Please report this issue to the authors of %s", ItemUtils.getModId(bannedItem)); @@ -160,6 +162,7 @@ public class Preloader_GT_OreDict { h.printStackTrace(); } } + } //FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "%s", e.getMessage()); } return false; diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 3d2ec378b5..4a78322487 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Adds over 100 new Multiblocks, Machines, etc to Gregtech.", "credits": "", "logoFile": "", - "version": "1.7.0-prerelease-11-final", + "version": "1.7.0-prerelease-14-final", "mcversion": "1.7.10", "url": "https://github.com/draknyte1/GTplusplus/wiki", "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest", -- cgit