aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/handler/GuiHandler.java24
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_General.java41
-rw-r--r--src/Java/gtPlusPlus/core/util/item/ItemUtils.java45
3 files changed, 58 insertions, 52 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
index 124b01a2c0..6791289f9f 100644
--- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
@@ -3,12 +3,24 @@ package gtPlusPlus.core.handler;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
import gtPlusPlus.GTplusplus;
-import gtPlusPlus.core.container.*;
+import gtPlusPlus.core.container.Container_BackpackBase;
+import gtPlusPlus.core.container.Container_FishTrap;
+import gtPlusPlus.core.container.Container_Grindle;
+import gtPlusPlus.core.container.Container_ModularityTable;
+import gtPlusPlus.core.container.Container_ProjectTable;
+import gtPlusPlus.core.container.Container_TradeTable;
+import gtPlusPlus.core.container.Container_Workbench;
+import gtPlusPlus.core.container.Container_WorkbenchAdvanced;
import gtPlusPlus.core.gui.beta.Gui_ID_Registry;
import gtPlusPlus.core.gui.beta.MU_GuiId;
import gtPlusPlus.core.gui.item.GuiBaseBackpack;
import gtPlusPlus.core.gui.item.GuiBaseGrindle;
-import gtPlusPlus.core.gui.machine.*;
+import gtPlusPlus.core.gui.machine.GUI_FishTrap;
+import gtPlusPlus.core.gui.machine.GUI_ModularityTable;
+import gtPlusPlus.core.gui.machine.GUI_ProjectTable;
+import gtPlusPlus.core.gui.machine.GUI_TradeTable;
+import gtPlusPlus.core.gui.machine.GUI_Workbench;
+import gtPlusPlus.core.gui.machine.GUI_WorkbenchAdvanced;
import gtPlusPlus.core.interfaces.IGuiManager;
import gtPlusPlus.core.inventories.BaseInventoryBackpack;
import gtPlusPlus.core.inventories.BaseInventoryGrindle;
@@ -34,8 +46,8 @@ public class GuiHandler implements IGuiHandler {
public static final int GUI5 = 4; //Workbench Adv
public static final int GUI6 = 5; //Fish trap
public static final int GUI7 = 6; //Trade table
- public static final int GUI8 = 7; //
- public static final int GUI9 = 8; //
+ public static final int GUI8 = 7; //Alchemical Furnace
+ public static final int GUI9 = 8; //Grindle
@@ -83,7 +95,7 @@ public class GuiHandler implements IGuiHandler {
return new Container_TradeTable(player.inventory, (TileEntityTradeTable)te);
}
}
-
+
if (ID == GUI9){
return new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem()));
}
@@ -132,7 +144,7 @@ public class GuiHandler implements IGuiHandler {
return new GUI_TradeTable(player.inventory, (TileEntityTradeTable)te, ((TileEntityBase) te).getOwner());
}
}
-
+
if (ID == GUI9){
return new GuiBaseGrindle(new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem())));
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index e9a2ee86b4..f5f793da77 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -1,28 +1,19 @@
package gtPlusPlus.core.recipe;
import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.fluid.FluidUtils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.recipe.RecipeUtils;
-import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
public class RECIPES_General {
@@ -102,18 +93,18 @@ public class RECIPES_General {
"stickWood", "treeSapling", "stickWood",
"stickWood", "dustBone", "stickWood",
ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))){
- Utils.LOG_INFO("Added a recipe for Rainforest oak Saplings.");
+ Utils.LOG_INFO("Added a recipe for Rainforest oak Saplings.");
}
//Iron bars
- ItemStack ironBars = ItemUtils.getItemStack("minecraft:iron_bars", 1);
+ final ItemStack ironBars = ItemUtils.getItemStack("minecraft:iron_bars", 1);
//Fish Trap
if (RecipeUtils.recipeBuilder(
ironBars, ironBars, ironBars,
ironBars, "frameGtWroughtIron", ironBars,
ironBars, ironBars, ironBars,
ItemUtils.getSimpleStack(ModBlocks.blockFishTrap))){
- Utils.LOG_INFO("Added a recipe for the Fish Trap.");
+ Utils.LOG_INFO("Added a recipe for the Fish Trap.");
}
//Alkalus Coin
@@ -122,31 +113,31 @@ public class RECIPES_General {
"gemFlawlessRuby", ItemList.Credit_Greg_Naquadah.get(1), "gemFlawlessSapphire",
"gemExquisiteEmerald", "gemFlawlessEmerald", "gemExquisiteSapphire",
ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk))){
- Utils.LOG_INFO("Added a recipe for The Alkalus Disk.");
+ Utils.LOG_INFO("Added a recipe for The Alkalus Disk.");
}
- String fancyGems[] = new String[]{"gemExquisiteDiamond", "gemExquisiteEmerald", "gemExquisiteRuby", "gemExquisiteSapphire"};
- ItemStack gemShards[] = new ItemStack[]{ItemUtils.simpleMetaStack(ModItems.itemGemShards, 0, 1),
+ final String fancyGems[] = new String[]{"gemExquisiteDiamond", "gemExquisiteEmerald", "gemExquisiteRuby", "gemExquisiteSapphire"};
+ final ItemStack gemShards[] = new ItemStack[]{ItemUtils.simpleMetaStack(ModItems.itemGemShards, 0, 1),
ItemUtils.simpleMetaStack(ModItems.itemGemShards, 1, 1),
ItemUtils.simpleMetaStack(ModItems.itemGemShards, 2, 1),
ItemUtils.simpleMetaStack(ModItems.itemGemShards, 3, 1)};
-
+
int l=0;
- for (String gem : fancyGems){
+ for (final String gem : fancyGems){
GameRegistry.addShapelessRecipe(
gemShards[l],
ItemUtils.getItemStackOfAmountFromOreDict(gem, 1),
new ItemStack(ModItems.itemAlkalusDisk, 1, OreDictionary.WILDCARD_VALUE));
l++;
}
-
+
RecipeUtils.addShapedGregtechRecipe(
"stickBlackSteel", "plateTungstenSteel", "stickBlackSteel",
- "plateTungstenSteel", "blockIron", "plateTungstenSteel",
- "stickBlackSteel", "plateTungstenSteel", "stickBlackSteel",
- ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard));
+ "plateTungstenSteel", ItemUtils.getSimpleStack(Items.nether_star), "plateTungstenSteel",
+ "stickBlackSteel", "plateTungstenSteel", "stickBlackSteel",
+ ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 32));
- //Alkalus Coin
+ //Alkalus Coin
/*AddGregtechRecipe.addAssemblylineRecipe(
ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk),
288000,
@@ -160,16 +151,16 @@ public class RECIPES_General {
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16L),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16L),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16L),
- GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 2L)},
+ GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 2L)},
new FluidStack[]{
Materials.Osmium.getMolten(144*32),
Materials.Europium.getFluid(144*8)},
ItemUtils.getSimpleStack(Dimension_DarkWorld.portalItem),
30*20*60,
100000);*/
-
- }
}
+}
+
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index 337e301414..3680dfb59d 100644
--- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -42,6 +42,9 @@ public class ItemUtils {
public static ItemStack getSimpleStack(final Block x){
return getSimpleStack(Item.getItemFromBlock(x), 1);
}
+ public static ItemStack getSimpleStack(final Block x, final int i){
+ return getSimpleStack(Item.getItemFromBlock(x), i);
+ }
public static ItemStack getSimpleStack(final Item x, final int i){
try {
final ItemStack r = new ItemStack(x, i);
@@ -61,8 +64,8 @@ public class ItemUtils {
}
public static final int WILDCARD_VALUE = Short.MAX_VALUE;
- public static ItemStack getWildcardStack(Item x){
- ItemStack y = new ItemStack(x, 1, WILDCARD_VALUE);
+ public static ItemStack getWildcardStack(final Item x){
+ final ItemStack y = new ItemStack(x, 1, WILDCARD_VALUE);
return y;
}
@@ -265,8 +268,8 @@ public class ItemUtils {
//Adds a check to grab dusts using GT methodology if possible.
ItemStack returnValue = null;
if (oredictName.toLowerCase().contains("dust")){
- String MaterialName = oredictName.toLowerCase().replace("dust", "");
- Materials m = Materials.get(MaterialName);
+ final String MaterialName = oredictName.toLowerCase().replace("dust", "");
+ final Materials m = Materials.get(MaterialName);
returnValue = getGregtechDust(m, amount);
if (returnValue != null){
return returnValue;
@@ -284,7 +287,7 @@ public class ItemUtils {
Utils.LOG_WARNING(oredictName+" was not valid.");
return null;
}
- catch (Throwable t){
+ catch (final Throwable t){
return null;
}
}
@@ -317,7 +320,7 @@ public class ItemUtils {
return output;
}
- public static Item generateSpecialUsePlate(String internalName, String displayName, short[] rgb, int radioactivity){
+ public static Item generateSpecialUsePlate(final String internalName, final String displayName, final short[] rgb, final int radioactivity){
return new BaseItemPlate_OLD(internalName, displayName, Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]), radioactivity);
}
@@ -344,7 +347,7 @@ public class ItemUtils {
public static MultiPickaxeBase generateMultiPick(final boolean GT_Durability, final Materials material){
final ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material);
- int enchantLevel = material.mEnchantmentToolsLevel;
+ final int enchantLevel = material.mEnchantmentToolsLevel;
final Object enchant = new Pair(material.mEnchantmentTools, enchantLevel);
return generateMultiPick(GT_Durability, customMaterial, material.mDefaultLocalName, material.mDurability, material.mRGBa, enchant);
}
@@ -575,24 +578,24 @@ public class ItemUtils {
return outputs;
}
- private static String getModId(Item item) {
+ private static String getModId(final Item item) {
try {
- GameRegistry.UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor(item);
- String modname = (id.modId == null ? id.name : id.modId);
- return id == null || id.modId.equals("") ? "minecraft" : modname;
- } catch (Throwable t){
+ final GameRegistry.UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor(item);
+ final String modname = (id.modId == null ? id.name : id.modId);
+ return (id == null) || id.modId.equals("") ? "minecraft" : modname;
+ } catch (final Throwable t){
try {
- UniqueIdentifier t2 = GameRegistry.findUniqueIdentifierFor(Block.getBlockFromItem(item));
- String modname = (t2.modId == null ? t2.name : t2.modId);
- return t2 == null || t2.modId.equals("") ? "minecraft" : modname;
+ final UniqueIdentifier t2 = GameRegistry.findUniqueIdentifierFor(Block.getBlockFromItem(item));
+ final String modname = (t2.modId == null ? t2.name : t2.modId);
+ return (t2 == null) || t2.modId.equals("") ? "minecraft" : modname;
}
- catch (Throwable t3){
+ catch (final Throwable t3){
return "bad modid";
}
}
}
- public static String getModId(ItemStack key) {
+ public static String getModId(final ItemStack key) {
return getModId(key.getItem());
}
@@ -602,13 +605,13 @@ public class ItemUtils {
if (!oreDictList.isEmpty()){
ItemStack returnvalue;
for (int xrc=0;xrc<oreDictList.size();xrc++){
- String modid = getModId(oreDictList.get(xrc).getItem());
+ final String modid = getModId(oreDictList.get(xrc).getItem());
if (modid.equals("gregtech") || modid.equals(CORE.MODID)){
returnvalue = oreDictList.get(xrc).copy();
returnvalue.stackSize = amount;
return returnvalue;
}
- }
+ }
}
return getNonTinkersDust(oredictName, amount);
}
@@ -619,13 +622,13 @@ public class ItemUtils {
if (!oreDictList.isEmpty()){
ItemStack returnvalue;
for (int xrc=0;xrc<oreDictList.size();xrc++){
- String modid = getModId(oreDictList.get(xrc).getItem());
+ final String modid = getModId(oreDictList.get(xrc).getItem());
if (!modid.equals("tconstruct")){
returnvalue = oreDictList.get(xrc).copy();
returnvalue.stackSize = amount;
return returnvalue;
}
- }
+ }
}
//If only Tinkers dust exists, bow down and just use it.
return getItemStackOfAmountFromOreDictNoBroken(oredictName, amount);
generated by cgit (git 2.46.0) at 2025-04-25 07:27:38 +0000