diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
8 files changed, 160 insertions, 50 deletions
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java new file mode 100644 index 0000000000..c7b90b780c --- /dev/null +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java @@ -0,0 +1,29 @@ +package gtPlusPlus.core.common.compat; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.util.minecraft.ItemUtils; + +public class COMPAT_OpenBlocks { + + public static void OreDict(){ + run(); + } + + private static final void run(){ + + Item aGraveItem = ItemUtils.getItem("OpenBlocks:grave"); + if (aGraveItem == null) { + return; + } + Block aGraveBlock = Block.getBlockFromItem(aGraveItem); + if (aGraveBlock == null) { + return; + } + + Logger.INFO("[Hungry Node Blacklist] Setting the Hardness of the OpenBlocks Grave to 6."); + aGraveBlock.setHardness(6f); + } + +} diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index eaa17f9f87..31819c5030 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -140,6 +140,9 @@ public class COMPAT_HANDLER { if (LoadedMods.MorePlanets){ COMPAT_MorePlanets.OreDict(); } + if (LoadedMods.OpenBlocks){ + COMPAT_OpenBlocks.OreDict(); + } if (LoadedMods.Simply_Jetpacks){ COMPAT_SimplyJetpacks.OreDict(); } diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index a14073e569..b89fd2158f 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -1,28 +1,24 @@ package gtPlusPlus.core.item; -import static gtPlusPlus.core.creative.AddToCreativeTab.*; +import static gtPlusPlus.core.creative.AddToCreativeTab.tabMachines; +import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT; -import com.ibm.icu.util.RangeValueIterator.Element; - import cpw.mods.fml.common.registry.GameRegistry; - -import net.minecraft.item.*; -import net.minecraft.item.Item.ToolMaterial; -import net.minecraft.util.EnumChatFormatting; - import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; -import gregtech.api.enums.TextureSet; import gregtech.api.util.GT_OreDictUnificator; - import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.block.base.BlockBaseModular; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; +import gtPlusPlus.core.block.base.BlockBaseModular; 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.BaseEuItem; +import gtPlusPlus.core.item.base.BaseItemBackpack; +import gtPlusPlus.core.item.base.BaseItemBurnable; import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes; +import gtPlusPlus.core.item.base.BaseItemDamageable; +import gtPlusPlus.core.item.base.BaseItemTCShard; +import gtPlusPlus.core.item.base.CoreItem; import gtPlusPlus.core.item.base.foil.BaseItemFoil; import gtPlusPlus.core.item.base.foods.BaseItemFood; import gtPlusPlus.core.item.base.foods.BaseItemHotFood; @@ -31,7 +27,6 @@ import gtPlusPlus.core.item.base.ingots.BaseItemIngot; import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD; import gtPlusPlus.core.item.base.misc.BaseItemMisc; import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes; -import gtPlusPlus.core.item.base.misc.BaseItemParticle; import gtPlusPlus.core.item.base.plates.BaseItemPlate; import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble; import gtPlusPlus.core.item.bauble.HealthBoostBauble; @@ -42,36 +37,64 @@ import gtPlusPlus.core.item.chemistry.NuclearChem; import gtPlusPlus.core.item.chemistry.RocketFuels; import gtPlusPlus.core.item.chemistry.StandardBaseParticles; import gtPlusPlus.core.item.effects.RarityUncommon; -import gtPlusPlus.core.item.general.*; +import gtPlusPlus.core.item.general.BaseItemGrindle; +import gtPlusPlus.core.item.general.BufferCore; +import gtPlusPlus.core.item.general.ItemAirFilter; +import gtPlusPlus.core.item.general.ItemAreaClear; +import gtPlusPlus.core.item.general.ItemBasicFirestarter; +import gtPlusPlus.core.item.general.ItemBlueprint; +import gtPlusPlus.core.item.general.ItemControlCore; +import gtPlusPlus.core.item.general.ItemEmpty; +import gtPlusPlus.core.item.general.ItemGemShards; +import gtPlusPlus.core.item.general.ItemGenericToken; +import gtPlusPlus.core.item.general.ItemGiantEgg; +import gtPlusPlus.core.item.general.ItemHalfCompleteCasings; +import gtPlusPlus.core.item.general.ItemLavaFilter; +import gtPlusPlus.core.item.general.RF2EU_Battery; import gtPlusPlus.core.item.general.books.ItemBaseBook; import gtPlusPlus.core.item.general.capture.ItemEntityCatcher; -import gtPlusPlus.core.item.general.chassis.*; +import gtPlusPlus.core.item.general.chassis.ItemBoilerChassis; +import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoil; +import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire; import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion; import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion; import gtPlusPlus.core.item.init.ItemsFoods; -import gtPlusPlus.core.item.init.ItemsMultiTools; import gtPlusPlus.core.item.materials.DustDecayable; +import gtPlusPlus.core.item.tool.misc.GregtechPump; import gtPlusPlus.core.item.tool.misc.SandstoneHammer; import gtPlusPlus.core.item.tool.misc.box.AutoLunchBox; import gtPlusPlus.core.item.tool.misc.box.MagicToolBag; import gtPlusPlus.core.item.tool.misc.box.UniversalToolBox; -import gtPlusPlus.core.item.tool.misc.GregtechPump; -import gtPlusPlus.core.item.tool.staballoy.*; +import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase; +import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase; +import gtPlusPlus.core.item.tool.staballoy.StaballoyAxe; +import gtPlusPlus.core.item.tool.staballoy.StaballoyPickaxe; import gtPlusPlus.core.item.wearable.WearableLoader; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.material.*; +import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.NONMATERIAL; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.debug.DEBUG_INIT; -import gtPlusPlus.core.util.minecraft.*; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.everglades.GTplusplus_Everglades; import gtPlusPlus.xmod.eio.material.MaterialEIO; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java index da0357a9c4..e749885dd6 100644 --- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java @@ -40,6 +40,7 @@ public class LoadedMods { public static boolean ThermalFoundation = false; public static boolean IHL = false; public static boolean OpenComputers = false; //OpenComputers + public static boolean OpenBlocks = false; public static boolean Computronics = false; //computronics public static boolean DreamCraft = false; //GT: New Horizons public static boolean BeyondRealityCore = false; //Beyond Reality - Probably Classic @@ -140,6 +141,11 @@ public class LoadedMods { Logger.INFO("Components enabled for: StevesCarts"); totalMods++; } + if (Loader.isModLoaded("OpenBlocks")){ + OpenBlocks = true; + Logger.INFO("Components enabled for: OpenBlocks"); + totalMods++; + } if (Loader.isModLoaded("Thaumcraft")){ Thaumcraft = true; Logger.INFO("Components enabled for: Thaumcraft"); diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index a27cace300..c7397962ad 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -623,8 +623,8 @@ public final class ALLOY { "HG-1223", //Material Name MaterialState.LIQUID, //State new short[]{39,85,159, 0}, //Material Colour - -1, //Melting Point in C - -1, //Boiling Point in C + 6357, //Melting Point in C + 8563, //Boiling Point in C -1, -1, false, //Uses Blast furnace? diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 456b535606..eca9e278e2 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -21,6 +21,7 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.material.Particle; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.material.nuclear.NUCLIDE; @@ -225,6 +226,27 @@ public class RECIPES_GREGTECH { 0, 20 * 45, 120); + + //HG1223 + CORE.RA.addBlastSmelterRecipe( + new ItemStack[] { + ItemUtils.getGregtechCircuit(5), + ELEMENT.getInstance().MERCURY.getCell(1), + ELEMENT.getInstance().BARIUM.getDust(2), + ELEMENT.getInstance().CALCIUM.getDust(2), + ELEMENT.getInstance().COPPER.getDust(3), + }, + ELEMENT.getInstance().OXYGEN.getFluid(8000), + ALLOY.HG1223.getFluid(16 * 144), + new ItemStack[] { + CI.emptyCells(1) + }, + 100, //Output Chance + 20 * 120, + 122880); + + + // Germanium Roasting CORE.RA.addBlastSmelterRecipe( @@ -1137,7 +1159,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 144 * 5), FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144 * 5), null, 3000, 500); - GT_Values.RA.addMixerRecipe( + /*GT_Values.RA.addMixerRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2), @@ -1146,7 +1168,7 @@ public class RECIPES_GREGTECH { ALLOY.HG1223.getFluid(144*16), CI.emptyCells(1), 30 * 20, - 500); + 500);*/ } private static void chemicalReactorRecipes() { @@ -1623,14 +1645,14 @@ public class RECIPES_GREGTECH { private static void advancedMixerRecipes() { // HgBa2Ca2Cu3O8 - CORE.RA.addMixerRecipe( + /*CORE.RA.addMixerRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), FluidUtils.getFluidStack("oxygen", 8000), null, CI.emptyCells(1), ALLOY.HG1223.getDust(16), null, null, - 30 * 20, 500); + 30 * 20, 500); */ } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 16559c4fcf..5d8c040996 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -734,7 +734,7 @@ public class RECIPES_Machines { RECIPE_IndustrialSieveGrate); } - if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer){ + if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer){/* //Industrial Tree Farmer RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); RECIPE_TreeFarmFrame = GregtechItemList.TreeFarmer_Structural.get(Casing_Amount); @@ -759,7 +759,7 @@ public class RECIPES_Machines { "plankWood", "frameGtTumbaga", "plankWood", "plankWood", "plankWood", "plankWood", RECIPE_TreeFarmFrame); - } + */} if (CORE.ConfigSwitches.enableMachine_Tesseracts){ //Tesseracts @@ -784,11 +784,16 @@ public class RECIPES_Machines { ItemStack washerPipe; if (CORE.ConfigSwitches.enableCustom_Pipes){ washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1); + RecipeUtils.addShapedGregtechRecipe( + plateWrought, CI.electricPump_LV, plateWrought, + plateWrought, washerPipe, plateWrought, + plateWrought, CI.machineCasing_ULV, plateWrought, + GregtechItemList.SimpleDustWasher.get(1)); } - else { - washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeCopper", 1); + else { } //Add Recipe + washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeCopper", 1); RecipeUtils.addShapedGregtechRecipe( plateWrought, CI.electricPump_LV, plateWrought, plateWrought, washerPipe, plateWrought, @@ -1091,27 +1096,49 @@ public class RECIPES_Machines { GregtechItemList.Industrial_WashPlant.get(1)); } - if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter){ + if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter) { - ItemStack aCoreBlock = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemList.valueOf("Block_IridiumTungstensteel").get(1, ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1)) : ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1); + ItemStack aCoreBlock = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK + ? ItemList.valueOf("Block_IridiumTungstensteel").get(1, + ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1)) + : ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1); - RecipeUtils.recipeBuilder( - "plateTungstenSteel", CI.craftingToolHammer_Hard, "plateTungstenSteel", - "plateStellite", aCoreBlock, "plateStellite", - "plateTungstenSteel", CI.craftingToolWrench, "plateTungstenSteel", - GregtechItemList.Casing_Autocrafter.get(Casing_Amount)); + aCoreBlock.stackSize = GTNH ? 2 : 1; - RecipeUtils.recipeBuilder( - "plateTungstenSteel", ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR),"plateTungstenSteel", - CI.emitter_IV,GregtechItemList.Gregtech_Computer_Cube.get(1), CI.sensor_IV, - "plateTungstenSteel", "cableGt08Osmium","plateTungstenSteel", - GregtechItemList.GT4_Multi_Crafter.get(1)); + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), GTNH ? 2 : 1), + aCoreBlock, + CI.getTieredComponent(OrePrefixes.circuit, GTNH ? 3 : 2, 16), + CI.getTieredComponent(OrePrefixes.screw, GTNH ? 6 : 5, 32), + CI.getTieredComponent(OrePrefixes.bolt, GTNH ? 6 : 5, 12), + CI.getTieredComponent(OrePrefixes.plate, GTNH ? 7 : 6, 8), }, + CI.getTertiaryTieredFluid(6, 144 * (GTNH ? 12 : 4)), + GregtechItemList.Casing_Autocrafter.get(Casing_Amount), 20 * 60 * 2, + MaterialUtils.getVoltageForTier(GTNH ? 7 : 6)); + + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + GregtechItemList.Casing_Refinery_Structural.get(4), + ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, GTNH ? 2 : 1), + CI.getTieredComponent(OrePrefixes.cableGt08, GTNH ? 7 : 6, GTNH ? 32 : 16), + CI.getEmitter(GTNH ? 7 : 5, 2), + CI.getSensor(GTNH ? 7 : 5, 2), + GregtechItemList.Gregtech_Computer_Cube.get(1), + }, + CI.getTieredFluid(7, 144 * (GTNH ? 32 : 8)), GregtechItemList.GT4_Multi_Crafter.get(1), + 20 * 60 * 5, MaterialUtils.getVoltageForTier(GTNH ? 7 : 6)); + + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), Casing_Amount), + CI.getEmitter(GTNH ? 5 : 4, GTNH ? 4 : 2), CI.getRobotArm(GTNH ? 5 : 4, GTNH ? 4 : 2), + CI.getTieredComponent(OrePrefixes.circuit, GTNH ? 3 : 2, 8), + CI.getTieredComponent(OrePrefixes.screw, GTNH ? 4 : 3, 8), + CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 16 : 4), }, + CI.getAlternativeTieredFluid(5, 144 * 4), ItemUtils.getSimpleStack(ModBlocks.blockProjectTable), + 20 * 30 * 3, MaterialUtils.getVoltageForTier(GTNH ? 5 : 4)); - RecipeUtils.recipeBuilder( - "plateTungstenSteel",CI.craftingToolSolderingIron,"plateStainlessSteel", - CI.robotArm_EV, ItemList.Casing_SolidSteel.get(1), CI.robotArm_EV, - "plateStainlessSteel",CI.emitter_EV,"plateTungstenSteel", - ItemUtils.getSimpleStack(ModBlocks.blockProjectTable)); } if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine){ diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index f3dccf1390..45d21a3016 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -255,8 +255,8 @@ public class MaterialUtils { } public static int getVoltageForTier(int aTier) { - aTier += 1; - if (aTier == 0) { + //aTier += 1; - Probably some logic to this, idk. + if (aTier <= 0) { return 16; } else if (aTier == 1) { return 30; |