Browse Source

Fixed a bunch of minor things

Gregorius Techneticies 3 months ago
parent
commit
389b84d448
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F
20 changed files with 71 additions and 48 deletions
  1. 4
    4
      src/main/java/gregapi/data/MT.java
  2. 14
    2
      src/main/java/gregapi/item/multiitem/behaviors/Behavior_Switch_Metadata.java
  3. 4
    2
      src/main/java/gregapi/util/ST.java
  4. 8
    7
      src/main/java/gregtech/items/MultiItemRandomTools.java
  5. 12
    4
      src/main/java/gregtech/items/behaviors/Behavior_Builderwand.java
  6. 2
    2
      src/main/java/gregtech/items/tools/electric/GT_Tool_JackHammer_HV.java
  7. 2
    2
      src/main/java/gregtech/items/tools/electric/GT_Tool_MonkeyWrench_HV.java
  8. 2
    2
      src/main/java/gregtech/items/tools/electric/GT_Tool_MonkeyWrench_LV.java
  9. 2
    2
      src/main/java/gregtech/items/tools/electric/GT_Tool_MonkeyWrench_MV.java
  10. 2
    2
      src/main/java/gregtech/items/tools/electric/GT_Tool_Wrench_LV.java
  11. 2
    2
      src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Chisel.java
  12. 2
    2
      src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Cutter.java
  13. 2
    2
      src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_File.java
  14. 2
    2
      src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Knife.java
  15. 2
    2
      src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Multitool.java
  16. 2
    2
      src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Saw.java
  17. 2
    2
      src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Scissors.java
  18. 2
    2
      src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Screwdriver.java
  19. 1
    1
      src/main/java/gregtech/loaders/a/Loader_Tools.java
  20. 2
    2
      src/main/java/gregtech/loaders/c/Loader_Recipes_Other.java

+ 4
- 4
src/main/java/gregapi/data/MT.java View File

@@ -3215,10 +3215,10 @@ public class MT {
3215 3215
 		public static final OreDictMaterial
3216 3216
 		Dye_Materials[]             = {Black, Red, Green, Brown, Blue, Purple, Cyan, LightGray, Gray, Pink, Lime, Yellow, LightBlue, Magenta, Orange, White},
3217 3217
 		
3218
-		Heat_T[]                    = {ANY.Stone    , ANY.Steel         , Invar     , Ti                , TungstenCarbide   , ANY.W     , ANY.W             , ANY.W             , ANY.W             , ANY.W             , ANY.W             , ANY.W             , ANY.W             , ANY.W             , ANY.W             , ANY.W             },
3219
-		Kinetic_T[]                 = {ANY.Wood     , Bronze            , ANY.Steel , Ti                , TungstenSteel     , Ir        , Os                , Os                , Os                , Os                , Os                , Os                , Os                , Os                , Os                , Os                },
3220
-		Electric_T[]                = {TinAlloy     , SteelGalvanized   , Al        , StainlessSteel    , Cr                , Ti        , Ir                , Os                , Trinitanium       , Trinaquadalloy    , Neutronium        , Neutronium        , Neutronium        , Neutronium        , Neutronium        , Neutronium        },
3221
-		Flux_T[]                    = {Sn           , Pb                , Invar     , Electrum          , EnderiumBase      , Enderium  , TungstenCarbide   , TungstenCarbide   , TungstenCarbide   , TungstenCarbide   , TungstenCarbide   , TungstenCarbide   , TungstenCarbide   , TungstenCarbide   , TungstenCarbide   , TungstenCarbide   };
3218
+		Heat_T[]                    = {ANY.Stone, ANY.Steel      , Invar    , Ti            , TungstenCarbide, ANY.W   , ANY.W          , ANY.W          , ANY.W          , ANY.W          , ANY.W          , ANY.W          , ANY.W          , ANY.W          , ANY.W          , ANY.W          },
3219
+		Kinetic_T[]                 = {ANY.Wood , Bronze         , ANY.Steel, Ti            , TungstenSteel  , Ir      , Os             , Os             , Os             , Os             , Os             , Os             , Os             , Os             , Os             , Os             },
3220
+		Electric_T[]                = {TinAlloy , SteelGalvanized, Al       , StainlessSteel, Cr             , Ti      , Ir             , Os             , Trinitanium    , Trinaquadalloy , Neutronium     , Neutronium     , Neutronium     , Neutronium     , Neutronium     , Neutronium     },
3221
+		Flux_T[]                    = {Sn       , Pb             , Invar    , Electrum      , EnderiumBase   , Enderium, TungstenCarbide, TungstenCarbide, TungstenCarbide, TungstenCarbide, TungstenCarbide, TungstenCarbide, TungstenCarbide, TungstenCarbide, TungstenCarbide, TungstenCarbide};
3222 3222
 	}
3223 3223
 	
3224 3224
 	/** The Section where I place regular Ores that are only used in advanced processing anyways due to complexity. */

+ 14
- 2
src/main/java/gregapi/item/multiitem/behaviors/Behavior_Switch_Metadata.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -21,6 +21,8 @@ package gregapi.item.multiitem.behaviors;
21 21
 
22 22
 import static gregapi.data.CS.*;
23 23
 
24
+import java.util.List;
25
+
24 26
 import gregapi.item.IItemGT;
25 27
 import gregapi.item.multiitem.MultiItem;
26 28
 import gregapi.item.multiitem.behaviors.IBehavior.AbstractBehaviorDefault;
@@ -33,14 +35,24 @@ import net.minecraft.world.World;
33 35
 
34 36
 public class Behavior_Switch_Metadata extends AbstractBehaviorDefault {
35 37
 	public final int mSwitchIndex;
36
-	public final boolean mCheckTarget;
38
+	public final boolean mCheckTarget, mShowModeSwitchTooltip;
37 39
 	
38 40
 	public Behavior_Switch_Metadata(int aSwitchIndex) {
39 41
 		this(aSwitchIndex, F);
40 42
 	}
41 43
 	public Behavior_Switch_Metadata(int aSwitchIndex, boolean aCheckTarget) {
44
+		this(aSwitchIndex, aCheckTarget, F);
45
+	}
46
+	public Behavior_Switch_Metadata(int aSwitchIndex, boolean aCheckTarget, boolean aShowModeSwitchTooltip) {
42 47
 		mSwitchIndex = aSwitchIndex;
43 48
 		mCheckTarget = aCheckTarget;
49
+		mShowModeSwitchTooltip = aShowModeSwitchTooltip;
50
+	}
51
+	
52
+	@Override
53
+	public List<String> getAdditionalToolTips(MultiItem aItem, List<String> aList, ItemStack aStack) {
54
+		if (mShowModeSwitchTooltip) aList.add("Sneak Rightclick to switch Mode");
55
+		return aList;
44 56
 	}
45 57
 	
46 58
 	@Override

+ 4
- 2
src/main/java/gregapi/util/ST.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -134,6 +134,8 @@ public class ST {
134 134
 	public static boolean isGT (ItemStack aStack) {return aStack != null && isGT_(aStack);}
135 135
 	public static boolean isGT_(ItemStack aStack) {return isGT(aStack.getItem());}
136 136
 	
137
+	public static boolean   valid(Block aBlock) {return aBlock != null && aBlock != NB;}
138
+	public static boolean invalid(Block aBlock) {return aBlock == null || aBlock == NB;}
137 139
 	public static boolean   valid(ItemStack aStack) {return aStack != null && aStack.stackSize >= 0 && item_(aStack) != null;}
138 140
 	public static boolean invalid(ItemStack aStack) {return aStack == null || aStack.stackSize <  0 || item_(aStack) == null;}
139 141
 	
@@ -717,7 +719,7 @@ public class ST {
717 719
 		Block aBlock = aTo.getBlock();
718 720
 		if (aBlock instanceof BlockRailBase) {
719 721
 			// Do not eject shit onto Rails directly.
720
-		} else if (aBlock.getMaterial() == Material.lava || aBlock instanceof BlockFire || (aBlock == NB && aTo.mY < 1)) {
722
+		} else if (aBlock.getMaterial() == Material.lava || aBlock instanceof BlockFire || (invalid(aBlock) && aTo.mY < 1)) {
721 723
 			for (int aSlotFrom : aSlotsFrom) {
722 724
 				ItemStack aStackFrom = aFrom.mTileEntity.getStackInSlot(aSlotFrom);
723 725
 				if (aStackFrom != null && aMinMove <= aStackFrom.stackSize && (aFilter == null || aFilter.contains(aStackFrom, T) != aInvertFilter) && canTake(aFrom.mTileEntity, aIgnoreSideFrom ? SIDE_ANY : aFrom.mSideOfTileEntity, aFrom.mSideOfTileEntity, aSlotFrom, aStackFrom)) {

+ 8
- 7
src/main/java/gregtech/items/MultiItemRandomTools.java View File

@@ -171,6 +171,7 @@ public class MultiItemRandomTools extends MultiItemRandom implements IItemRottab
171 171
 		CR.shapeless(IL.Ceramic_Ingot_Mold_Raw          .get(1), CR.DEF_NCC, new Object[] {IL.Ceramic_Mold_Raw, OP.ingot.dat(tMat)});
172 172
 		CR.shapeless(IL.Ceramic_Chunk_Mold_Raw          .get(1), CR.DEF_NCC, new Object[] {IL.Ceramic_Mold_Raw, OP.chunkGt.dat(tMat)});
173 173
 		CR.shapeless(IL.Ceramic_Chunk_Mold_Raw          .get(1), CR.DEF_NCC, new Object[] {IL.Ceramic_Mold_Raw, OP.rockGt.dat(tMat)});
174
+		CR.shapeless(IL.Ceramic_Nugget_Mold_Raw         .get(1), CR.DEF_NCC, new Object[] {IL.Ceramic_Mold_Raw, OP.nugget.dat(tMat)});
174 175
 		CR.shapeless(IL.Ceramic_Plate_Mold_Raw          .get(1), CR.DEF_NCC, new Object[] {IL.Ceramic_Mold_Raw, OP.plate.dat(tMat)});
175 176
 		CR.shapeless(IL.Ceramic_Plate_Mold_Raw          .get(1), CR.DEF_NCC, new Object[] {IL.Ceramic_Mold_Raw, OP.plateGem.dat(tMat)});
176 177
 		CR.shapeless(IL.Ceramic_Tiny_Plate_Mold_Raw     .get(1), CR.DEF_NCC, new Object[] {IL.Ceramic_Mold_Raw, OP.plateTiny.dat(tMat)});
@@ -304,11 +305,11 @@ public class MultiItemRandomTools extends MultiItemRandom implements IItemRottab
304 305
 			, addItem(mLastID+1, "Wooden Bucket", "Milk (you cannot drink out of Buckets!)", TC.stack(TC.ARBOR, 2), TC.stack(TC.SANO     , 2), new Behavior_Bucket_Simple(ST.make(Items.milk_bucket, 1, 0))                        , tData.copy(), FL.Milk.make(1000), FL.MilkGrC.make(1000)                               , OD.container1000milk)
305 306
 			, addItem(mLastID+1, "Wooden Bucket", "Latex"                                  , TC.stack(TC.ARBOR, 2), TC.stack(TC.LIMUS    , 2), Behavior_Bucket_Simple.INSTANCE                                                     , tData.copy(), FL.Latex.make(1000), FL.make("molten.latex", 1000)                      , OD.container1000latex)
306 307
 			, addItem(mLastID+1, "Wooden Bucket", "Creosote Oil"                           , TC.stack(TC.ARBOR, 2), TC.stack(TC.IGNIS    , 2), new Behavior_Bucket_Simple(IL.RC_Creosote_Bucket.get(1))                            , tData.copy(), FL.Oil_Creosote.make(1000)                                              , OD.container1000creosote)
307
-			, addItem(mLastID+1, "Wooden Bucket", "Sea Water (you cannot place this!)"     , TC.stack(TC.ARBOR, 2), TC.stack(TC.TEMPESTAS, 2), new Behavior_Switch_Metadata(2000 + i*100, F)                                       , tData.copy(), FL.Ocean.make(1000), FL.OceanGrC.make(1000), FL.Tropics_Water.make(1000))
308
+			, addItem(mLastID+1, "Wooden Bucket", "Sea Water (you cannot place this!)"     , TC.stack(TC.ARBOR, 2), TC.stack(TC.TEMPESTAS, 2), new Behavior_Switch_Metadata(2000 + i*100, F, F)                                    , tData.copy(), FL.Ocean.make(1000), FL.OceanGrC.make(1000), FL.Tropics_Water.make(1000))
308 309
 			, addItem(mLastID+1, "Wooden Bucket", "Rubber Tree Sap"                        , TC.stack(TC.ARBOR, 2), TC.stack(TC.LIMUS    , 2), Behavior_Bucket_Simple.INSTANCE                                                     , tData.copy(), FL.Resin_Rubber.make(1000)                                              , OD.container1000rubbertreesap)
309 310
 			, addItem(mLastID+1, "Wooden Bucket", "Spruce Tree Resin"                      , TC.stack(TC.ARBOR, 3), TC.stack(TC.LIMUS    , 1), Behavior_Bucket_Simple.INSTANCE                                                     , tData.copy(), FL.Resin_Spruce.make(1000)                                              , OD.container1000spruceresin)
310 311
 			, addItem(mLastID+1, "Wooden Bucket", "Honey"                                  , TC.stack(TC.ARBOR, 3), TC.stack(TC.BESTIA   , 1), new Behavior_Bucket_Simple(ST.make(MD.ERE, "bucketHoney", 1, 0, IL.FR_Honey_Bucket)), tData.copy(), FL.Honey.make(1000), FL.HoneyGrC.make(1000), FL.HoneyBoP.make(1000)     , OD.container1000honey)
311
-			, addItem(mLastID+1, "Wooden Bucket", "Dirty Water (you cannot place this!)"   , TC.stack(TC.ARBOR, 2), TC.stack(TC.AQUA     , 1), TC.stack(TC.VENENUM, 1), new Behavior_Switch_Metadata(2000 + i*100, F)              , tData.copy(), FL.Dirty_Water.make(1000)                                               )
312
+			, addItem(mLastID+1, "Wooden Bucket", "Dirty Water (you cannot place this!)"   , TC.stack(TC.ARBOR, 2), TC.stack(TC.AQUA     , 1), TC.stack(TC.VENENUM, 1), new Behavior_Switch_Metadata(2000 + i*100, F, F)           , tData.copy(), FL.Dirty_Water.make(1000)                                               )
312 313
 			, addItem(mLastID+1, "Wooden Bucket", "Lubricant"                              , TC.stack(TC.ARBOR, 2), TC.stack(TC.LIMUS    , 2), Behavior_Bucket_Simple.INSTANCE                                                     , tData.copy(), FL.LubRoCant.make(1000), FL.Lubricant.make(1000)                        , OD.container1000lubricant)
313 314
 			, addItem(mLastID+1, "Wooden Bucket", "Milk (you cannot drink out of Buckets!)", TC.stack(TC.ARBOR, 2), TC.stack(TC.VENENUM  , 2), Behavior_Bucket_Simple.INSTANCE                                                     , tData.copy(), FL.Milk_Spoiled.make(1000)                                              )
314 315
 			, addItem(mLastID+1, "Wooden Bucket", "Maple Sap"                              , TC.stack(TC.ARBOR, 2), TC.stack(TC.FAMES    , 2), Behavior_Bucket_Simple.INSTANCE                                                     , tData.copy(), FL.Sap_Maple.make(1000)                                                 , OD.container1000maplesap)
@@ -510,11 +511,11 @@ public class MultiItemRandomTools extends MultiItemRandom implements IItemRottab
510 511
 		OM.data(IL.Geiger_Counter.get(1), OM.data(IL.Geiger_Counter_Empty.get(1)));
511 512
 		
512 513
 		
513
-		IL.Compass_North                   .set(addItem(11000, "Compass (NORTH)"      , "Sneak Rightclick to switch Mode", OD.itemCompass, new Behavior_Switch_Metadata(11001, T), OM.data(ST.make(Items.compass, 1, 0)), TC.stack(TC.METALLUM, 2), TC.stack(TC.MAGNETO                                              , 2))); CR.shapeless(ST.make(Items.compass, 1, 0), CR.DEF, new Object[] {last()});
514
-		IL.Compass_Face                    .set(addItem(11001, "Compass (FACE)"       , "Sneak Rightclick to switch Mode", OD.itemCompass, new Behavior_Switch_Metadata(11002, T), OM.data(ST.make(Items.compass, 1, 0)), TD.Creative.HIDDEN, TC.stack(TC.METALLUM, 2), TC.stack(TC.MAGNETO, 1), TC.stack(TC.COGNITIO, 1))); CR.shapeless(ST.make(Items.compass, 1, 0), CR.DEF, new Object[] {last()});
515
-		IL.Compass_Spawn                   .set(addItem(11002, "Compass (SPAWN)"      , "Sneak Rightclick to switch Mode", OD.itemCompass, new Behavior_Switch_Metadata(11003, T), OM.data(ST.make(Items.compass, 1, 0)), TD.Creative.HIDDEN, TC.stack(TC.METALLUM, 2), TC.stack(TC.MAGNETO, 1), TC.stack(TC.HUMANUS , 1))); CR.shapeless(ST.make(Items.compass, 1, 0), CR.DEF, new Object[] {last()});
516
-		IL.Compass_Center                  .set(addItem(11003, "Compass (CENTER)"     , "Sneak Rightclick to switch Mode", OD.itemCompass, new Behavior_Switch_Metadata(11004, T), OM.data(ST.make(Items.compass, 1, 0)), TD.Creative.HIDDEN, TC.stack(TC.METALLUM, 2), TC.stack(TC.MAGNETO, 1), TC.stack(TC.TERRA   , 1))); CR.shapeless(ST.make(Items.compass, 1, 0), CR.DEF, new Object[] {last()});
517
-		IL.Compass_Death                   .set(addItem(11004, "Compass (DEATH)"      , "Sneak Rightclick to switch Mode", OD.itemCompass, new Behavior_Switch_Metadata(11000, T), OM.data(ST.make(Items.compass, 1, 0)), TD.Creative.HIDDEN, TC.stack(TC.METALLUM, 2), TC.stack(TC.MAGNETO, 1), TC.stack(TC.MORTUUS , 1))); CR.shapeless(ST.make(Items.compass, 1, 0), CR.DEF, new Object[] {last()});
514
+		IL.Compass_North                   .set(addItem(11000, "Compass (NORTH)" , "Points to Zed Negative"                             , OD.itemCompass, new Behavior_Switch_Metadata(11001, T, T), OM.data(ST.make(Items.compass, 1, 0)), TC.stack(TC.METALLUM, 2), TC.stack(TC.MAGNETO                                              , 2))); CR.shapeless(ST.make(Items.compass, 1, 0), CR.DEF, new Object[] {last()});
515
+		IL.Compass_Face                    .set(addItem(11001, "Compass (FACE)"  , "Points into the direction you look"                 , OD.itemCompass, new Behavior_Switch_Metadata(11002, T, T), OM.data(ST.make(Items.compass, 1, 0)), TD.Creative.HIDDEN, TC.stack(TC.METALLUM, 2), TC.stack(TC.MAGNETO, 1), TC.stack(TC.COGNITIO, 1))); CR.shapeless(ST.make(Items.compass, 1, 0), CR.DEF, new Object[] {last()});
516
+		IL.Compass_Spawn                   .set(addItem(11002, "Compass (SPAWN)" , "Points to the World Spawn like a normal Compass"    , OD.itemCompass, new Behavior_Switch_Metadata(11003, T, T), OM.data(ST.make(Items.compass, 1, 0)), TD.Creative.HIDDEN, TC.stack(TC.METALLUM, 2), TC.stack(TC.MAGNETO, 1), TC.stack(TC.HUMANUS , 1))); CR.shapeless(ST.make(Items.compass, 1, 0), CR.DEF, new Object[] {last()});
517
+		IL.Compass_Center                  .set(addItem(11003, "Compass (CENTER)", "Points towards the middle of the World"             , OD.itemCompass, new Behavior_Switch_Metadata(11004, T, T), OM.data(ST.make(Items.compass, 1, 0)), TD.Creative.HIDDEN, TC.stack(TC.METALLUM, 2), TC.stack(TC.MAGNETO, 1), TC.stack(TC.TERRA   , 1))); CR.shapeless(ST.make(Items.compass, 1, 0), CR.DEF, new Object[] {last()});
518
+		IL.Compass_Death                   .set(addItem(11004, "Compass (DEATH)" , "Points to your last Death, if you did not Rage Quit", OD.itemCompass, new Behavior_Switch_Metadata(11000, T, T), OM.data(ST.make(Items.compass, 1, 0)), TD.Creative.HIDDEN, TC.stack(TC.METALLUM, 2), TC.stack(TC.MAGNETO, 1), TC.stack(TC.MORTUUS , 1))); CR.shapeless(ST.make(Items.compass, 1, 0), CR.DEF, new Object[] {last()});
518 519
 		ItemsGT.addNEIRedirects(IL.Compass_North.get(1), IL.Compass_Face.get(1), IL.Compass_Spawn.get(1), IL.Compass_Center.get(1), IL.Compass_Death.get(1));
519 520
 		CR.shapeless(IL.Compass_North.get(1), CR.DEF, new Object[] {Items.compass});
520 521
 		

+ 12
- 4
src/main/java/gregtech/items/behaviors/Behavior_Builderwand.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -41,6 +41,9 @@ public class Behavior_Builderwand extends AbstractBehaviorDefault {
41 41
 		
42 42
 		Block aBlock = WD.block(aWorld, aX, aY, aZ, T);
43 43
 		byte aMeta = WD.meta(aWorld, aX, aY, aZ, T);
44
+		
45
+		if (ST.invalid(aBlock)) return F;
46
+		
44 47
 		int tDist = (MultiItemTool.getPrimaryMaterial(aStack).mToolQuality+1);
45 48
 		boolean rReturn = F;
46 49
 		
@@ -55,10 +58,15 @@ public class Behavior_Builderwand extends AbstractBehaviorDefault {
55 58
 			for (int i = 0; i < aPlayer.inventory.mainInventory.length; i++) {
56 59
 				int tIndex = aPlayer.inventory.mainInventory.length-i-1;
57 60
 				ItemStack tStack = aPlayer.inventory.mainInventory[tIndex];
58
-				
59 61
 				if (ST.invalid(tStack)) continue;
60
-				Block tBlock = (tStack.getItem() instanceof ItemBlock ? ((ItemBlock)tStack.getItem()).field_150939_a : ST.block(tStack));
61
-				if (tBlock == null || tBlock == NB) continue;
62
+				Block tBlock = ST.block(tStack);
63
+				if (ST.invalid(tBlock)) {
64
+					if (tStack.getItem() instanceof ItemBlock) {
65
+						tBlock = ((ItemBlock)tStack.getItem()).field_150939_a;
66
+						if (ST.invalid(tBlock)) continue;
67
+					} else continue;
68
+				}
69
+				
62 70
 				if (aBlock == tBlock) {
63 71
 					if (aMeta != ST.meta(tStack)) continue;
64 72
 				} else if (aBlock instanceof BlockMetaType && tBlock instanceof BlockMetaType) {

+ 2
- 2
src/main/java/gregtech/items/tools/electric/GT_Tool_JackHammer_HV.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -139,7 +139,7 @@ public class GT_Tool_JackHammer_HV extends GT_Tool_MiningDrill_LV {
139 139
 	
140 140
 	@Override
141 141
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
142
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
142
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, T));
143 143
 		super.onStatsAddedToTool(aItem, aID);
144 144
 	}
145 145
 	

+ 2
- 2
src/main/java/gregtech/items/tools/electric/GT_Tool_MonkeyWrench_HV.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -35,6 +35,6 @@ public class GT_Tool_MonkeyWrench_HV extends GT_Tool_Wrench_HV {
35 35
 	@Override
36 36
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
37 37
 		aItem.addItemBehavior(aID, new Behavior_Tool(TOOL_monkeywrench, SFX.GT_WRENCH, 100, !canBlock(), T));
38
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
38
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, F));
39 39
 	}
40 40
 }

+ 2
- 2
src/main/java/gregtech/items/tools/electric/GT_Tool_MonkeyWrench_LV.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -35,6 +35,6 @@ public class GT_Tool_MonkeyWrench_LV extends GT_Tool_Wrench_LV {
35 35
 	@Override
36 36
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
37 37
 		aItem.addItemBehavior(aID, new Behavior_Tool(TOOL_monkeywrench, SFX.GT_WRENCH, 100, !canBlock(), T));
38
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
38
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, F));
39 39
 	}
40 40
 }

+ 2
- 2
src/main/java/gregtech/items/tools/electric/GT_Tool_MonkeyWrench_MV.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -35,6 +35,6 @@ public class GT_Tool_MonkeyWrench_MV extends GT_Tool_Wrench_MV {
35 35
 	@Override
36 36
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
37 37
 		aItem.addItemBehavior(aID, new Behavior_Tool(TOOL_monkeywrench, SFX.GT_WRENCH, 100, !canBlock(), T));
38
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
38
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, F));
39 39
 	}
40 40
 }

+ 2
- 2
src/main/java/gregtech/items/tools/electric/GT_Tool_Wrench_LV.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -110,6 +110,6 @@ public class GT_Tool_Wrench_LV extends GT_Tool_Wrench {
110 110
 	@Override
111 111
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
112 112
 		super.onStatsAddedToTool(aItem, aID);
113
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
113
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, F));
114 114
 	}
115 115
 }

+ 2
- 2
src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Chisel.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -50,6 +50,6 @@ public class GT_Tool_Pocket_Chisel extends GT_Tool_Chisel {
50 50
 	@Override
51 51
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
52 52
 		super.onStatsAddedToTool(aItem, aID);
53
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
53
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, T));
54 54
 	}
55 55
 }

+ 2
- 2
src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Cutter.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -50,6 +50,6 @@ public class GT_Tool_Pocket_Cutter extends GT_Tool_WireCutter {
50 50
 	@Override
51 51
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
52 52
 		super.onStatsAddedToTool(aItem, aID);
53
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
53
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, T));
54 54
 	}
55 55
 }

+ 2
- 2
src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_File.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -50,6 +50,6 @@ public class GT_Tool_Pocket_File extends GT_Tool_File {
50 50
 	@Override
51 51
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
52 52
 		super.onStatsAddedToTool(aItem, aID);
53
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
53
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, T));
54 54
 	}
55 55
 }

+ 2
- 2
src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Knife.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -52,7 +52,7 @@ public class GT_Tool_Pocket_Knife extends GT_Tool_Knife {
52 52
 	@Override
53 53
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
54 54
 		super.onStatsAddedToTool(aItem, aID);
55
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
55
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, T));
56 56
 	}
57 57
 	
58 58
 	@Override

+ 2
- 2
src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Multitool.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -50,7 +50,7 @@ public class GT_Tool_Pocket_Multitool extends ToolStats {
50 50
 	
51 51
 	@Override
52 52
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
53
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
53
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, T));
54 54
 	}
55 55
 	
56 56
 	@Override

+ 2
- 2
src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Saw.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -50,6 +50,6 @@ public class GT_Tool_Pocket_Saw extends GT_Tool_Saw {
50 50
 	@Override
51 51
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
52 52
 		super.onStatsAddedToTool(aItem, aID);
53
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
53
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, T));
54 54
 	}
55 55
 }

+ 2
- 2
src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Scissors.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -50,6 +50,6 @@ public class GT_Tool_Pocket_Scissors extends GT_Tool_Scissors {
50 50
 	@Override
51 51
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
52 52
 		super.onStatsAddedToTool(aItem, aID);
53
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
53
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, T));
54 54
 	}
55 55
 }

+ 2
- 2
src/main/java/gregtech/items/tools/pocket/GT_Tool_Pocket_Screwdriver.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -50,6 +50,6 @@ public class GT_Tool_Pocket_Screwdriver extends GT_Tool_Screwdriver {
50 50
 	@Override
51 51
 	public void onStatsAddedToTool(MultiItemTool aItem, int aID) {
52 52
 		super.onStatsAddedToTool(aItem, aID);
53
-		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T));
53
+		aItem.addItemBehavior(aID, new Behavior_Switch_Metadata(mSwitchIndex, T, T));
54 54
 	}
55 55
 }

+ 1
- 1
src/main/java/gregtech/loaders/a/Loader_Tools.java View File

@@ -187,7 +187,7 @@ public class Loader_Tools implements Runnable {
187 187
 		ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.MONKEY_WRENCH_HV          , "Monkey Wrench (HV)"              , "Sneak Rightclick to switch to Wrench"                , new GT_Tool_MonkeyWrench_HV(ToolsGT.WRENCH_HV)                 .setMaterialAmount(toolHeadWrench                    .mAmount), OreDictToolNames.monkeywrench                                                                                                            , TC.stack(TC.MACHINA       , 4), TC.stack(TC.ORDO          , 2)                                                                ), TOOL_monkeywrench);
188 188
 		ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.TRIMMER_LV                , "Trimmer (LV)"                    , ""                                                    , new GT_Tool_Trimmer_LV()                                       .setMaterialAmount(2*toolHeadSword                   .mAmount), OreDictToolNames.branchcutter                                                                                                            , TC.stack(TC.MACHINA       , 2), TC.stack(TC.METO          , 2), TC.stack(TC.HERBA         , 2)                                ), TOOL_grafter);
189 189
 		
190
-					ToolsGT.sMetaTool.addTool(ToolsGT.POCKET_MULTITOOL          , "Pocket Multitool"                , "Sneak Rightclick to switch Tool"                     , new GT_Tool_Pocket_Multitool(ToolsGT.POCKET_KNIFE)             .setMaterialAmount(199*U18                                   )                                                                                                                                           , TC.stack(TC.INSTRUMENTUM  , 6), TC.stack(TC.FABRICO       , 3), TC.stack(TC.ORDO          , 3)                                );
190
+					ToolsGT.sMetaTool.addTool(ToolsGT.POCKET_MULTITOOL          , "Pocket Multitool"                , "7 useful Tools in one!"                              , new GT_Tool_Pocket_Multitool(ToolsGT.POCKET_KNIFE)             .setMaterialAmount(199*U18                                   )                                                                                                                                           , TC.stack(TC.INSTRUMENTUM  , 6), TC.stack(TC.FABRICO       , 3), TC.stack(TC.ORDO          , 3)                                );
191 191
 		ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.POCKET_KNIFE              , "Pocket Multitool (Knife)"        , ""                                                    , new GT_Tool_Pocket_Knife(ToolsGT.POCKET_SAW)                   .setMaterialAmount(199*U18                                   ), OreDictToolNames.blade, OreDictToolNames.knife, OreDictToolNames.hac_cuttingboard                                                        , TC.stack(TC.INSTRUMENTUM  , 6), TC.stack(TC.FABRICO       , 3), TC.stack(TC.ORDO          , 3)                                ), TOOL_knife);
192 192
 		ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.POCKET_SAW                , "Pocket Multitool (Saw)"          , "Faster on Planks. Slower on Logs. Can harvest Ice."  , new GT_Tool_Pocket_Saw(ToolsGT.POCKET_FILE)                    .setMaterialAmount(199*U18                                   ), OreDictToolNames.saw                                                                                                                     , TC.stack(TC.INSTRUMENTUM  , 6), TC.stack(TC.FABRICO       , 3), TC.stack(TC.ORDO          , 3)                                ), TOOL_saw);
193 193
 		ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.POCKET_FILE               , "Pocket Multitool (File)"         , "Harvests Iron Bars and similar faster"               , new GT_Tool_Pocket_File(ToolsGT.POCKET_SCREWDRIVER)            .setMaterialAmount(199*U18                                   ), OreDictToolNames.file                                                                                                                    , TC.stack(TC.INSTRUMENTUM  , 6), TC.stack(TC.FABRICO       , 3), TC.stack(TC.ORDO          , 3)                                ), TOOL_file);

+ 2
- 2
src/main/java/gregtech/loaders/c/Loader_Recipes_Other.java View File

@@ -576,8 +576,8 @@ public class Loader_Recipes_Other implements Runnable {
576 576
 		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Lin       .make(1000), FL.lube(1000), ZL_IS);
577 577
 		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Hemp      .make(1000), FL.lube(1000), ZL_IS);
578 578
 		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Fish      .make(1000), FL.lube(1000), ZL_IS);
579
-		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Seed      .make(1000), FL.lube(1000), ZL_IS);
580
-		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Plant     .make(1000), FL.lube(1000), ZL_IS);
579
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Seed      .make(1000), FL.lube(1000), ZL_IS); if (FL.Oil_Plant.exists())
580
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Plant     .make(1000), FL.lube(1000), ZL_IS); if (FL.Oil_Canola.exists())
581 581
 		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Canola    .make(1000), FL.lube(2000), ZL_IS);
582 582
 		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Creosote  .make(1000), FL.lube(2000), ZL_IS);
583 583
 		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Soulsand  .make(1000), FL.lube(3000), ZL_IS);

Loading…
Cancel
Save