diff options
author | chochem <40274384+chochem@users.noreply.github.com> | 2023-05-17 18:35:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-17 19:35:27 +0200 |
commit | 8e59f92c37c7d035c9c914aff4dbedfb77f0fec9 (patch) | |
tree | 880332068cd993e860f23e2d03d4544a41f2b38e /src/main/java/gregtech/common/items | |
parent | 0b72dbb844cd1bfedbb230980c47f94821aa69a2 (diff) | |
download | GT5-Unofficial-8e59f92c37c7d035c9c914aff4dbedfb77f0fec9.tar.gz GT5-Unofficial-8e59f92c37c7d035c9c914aff4dbedfb77f0fec9.tar.bz2 GT5-Unofficial-8e59f92c37c7d035c9c914aff4dbedfb77f0fec9.zip |
Various GT fixes (#2002)
* TE items cant be required
* remove from itemlist
* TE does not exist
* this never worked anyway but also unecessary
* these are broken. have a working replacement already
* give valid id to fix rockbreaker fake recipes
* fix texture and text
* no NC its fake anyway
Diffstat (limited to 'src/main/java/gregtech/common/items')
-rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java | 98 | ||||
-rw-r--r-- | src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java | 4 |
2 files changed, 2 insertions, 100 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index d1e6653c77..aa524e14f9 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -1806,102 +1806,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Plank_DarkOak.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 5) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Larch.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 0) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Teak.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 1) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Acacia_Green.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 2) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Lime.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 3) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Chestnut.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 4) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Wenge.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 5) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Baobab.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 6) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Sequoia.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 7) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Kapok.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 0) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Ebony.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 1) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Mahagony.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 2) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Balsa.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 3) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Willow.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 4) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Walnut.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 5) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Greenheart.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 6) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Cherry.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 7) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Mahoe.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 0) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Poplar.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 1) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Palm.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 2) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Papaya.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 3) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Pine.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 4) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Plum.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 5) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Maple.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 6) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Citrus.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 7) }); GregTech_API.registerCover(ItemList.Plank_Oak.get(1L), TextureFactory.of(Blocks.planks, 0), null); GregTech_API.registerCover(ItemList.Plank_Spruce.get(1L), TextureFactory.of(Blocks.planks, 1), null); @@ -2803,7 +2707,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { } ItemList.Display_ITS_FREE.set( addItem( - tLastID = 766, + tLastID = 765, "ITS FREE", "(or at least almost free)", SubTag.INVISIBLE, diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java index cab8e9a7a0..e44d764df7 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java @@ -18,7 +18,6 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.Dyes; -import gregtech.api.enums.ItemList; import gregtech.api.enums.SoundResource; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.util.GT_LanguageManager; @@ -37,8 +36,7 @@ public class Behaviour_Spray_Color extends Behaviour_None { Blocks.stained_glass, Blocks.stained_glass_pane, Blocks.carpet, - Blocks.hardened_clay, - ItemList.TE_Rockwool.getBlock()); + Blocks.hardened_clay); private final String mTooltip; private final String mTooltipUses = GT_LanguageManager .addStringLocalization("gt.behaviour.paintspray.uses", "Remaining Uses:"); |