aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java27
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java20
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java80
3 files changed, 0 insertions, 127 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index ac810f8eaf..03446092fc 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -100,33 +100,6 @@ public enum ItemList implements IItemContainer {
IC2_AdvBattery,
IC2_EnergyCrystal,
IC2_LapotronCrystal,
- Arrow_Head_Glass_Emtpy,
- Arrow_Head_Glass_Poison,
- Arrow_Head_Glass_Poison_Long,
- Arrow_Head_Glass_Poison_Strong,
- Arrow_Head_Glass_Slowness,
- Arrow_Head_Glass_Slowness_Long,
- Arrow_Head_Glass_Weakness,
- Arrow_Head_Glass_Weakness_Long,
- Arrow_Head_Glass_Holy_Water,
- Arrow_Wooden_Glass_Emtpy,
- Arrow_Wooden_Glass_Poison,
- Arrow_Wooden_Glass_Poison_Long,
- Arrow_Wooden_Glass_Poison_Strong,
- Arrow_Wooden_Glass_Slowness,
- Arrow_Wooden_Glass_Slowness_Long,
- Arrow_Wooden_Glass_Weakness,
- Arrow_Wooden_Glass_Weakness_Long,
- Arrow_Wooden_Glass_Holy_Water,
- Arrow_Plastic_Glass_Emtpy,
- Arrow_Plastic_Glass_Poison,
- Arrow_Plastic_Glass_Poison_Long,
- Arrow_Plastic_Glass_Poison_Strong,
- Arrow_Plastic_Glass_Slowness,
- Arrow_Plastic_Glass_Slowness_Long,
- Arrow_Plastic_Glass_Weakness,
- Arrow_Plastic_Glass_Weakness_Long,
- Arrow_Plastic_Glass_Holy_Water,
Shape_Empty,
Shape_Mold_Bottle,
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index 6f7c347884..a703e8690a 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -261,16 +261,6 @@ public enum OrePrefixes {
false, B[6] | B[8], M / 6, 64, -1),
bulletGtLarge("Large Bullets", "Large ", " Bullet", true, true, false, false, true, false, true, false, true, false,
B[6] | B[8], M / 3, 64, -1),
- /** Arrow made of 1/4 Ingot/Dust + Wooden Stick. */
- arrowGtWood("Regular Arrows", "", " Arrow", true, true, false, false, true, false, true, false, true, false, B[6],
- M / 4, 64, 57),
- /** Arrow made of 1/4 Ingot/Dust + Plastic Stick. */
- arrowGtPlastic("Light Arrows", "Light ", " Arrow", true, true, false, false, true, false, true, false, true, false,
- B[6], M / 4, 64, 58),
- arrow("Arrows", "", "", false, false, true, false, false, false, false, false, true, false, B[6], -1, 64, 57),
- /** consisting out of 1/4 Ingot. */
- toolHeadArrow("Arrow Heads", "", " Arrow Head", true, true, false, false, false, false, true, true, false, false,
- B[6], M / 4, 64, 46),
/** consisting out of 2 Ingots. */
toolHeadSword("Sword Blades", "", " Sword Blade", true, true, false, false, false, false, true, true, false, false,
B[6], M * 2, 64, 32),
@@ -780,11 +770,6 @@ public enum OrePrefixes {
block.mNotGeneratedItems.add(Materials.Redstone);
block.mNotGeneratedItems.add(Materials.Diamond);
block.mNotGeneratedItems.add(Materials.Coal);
- toolHeadArrow.mNotGeneratedItems.add(Materials.Glass);
- toolHeadArrow.mNotGeneratedItems.add(MaterialsUEVplus.TranscendentMetal);
- arrowGtPlastic.mNotGeneratedItems.add(MaterialsUEVplus.TranscendentMetal);
- arrow.mNotGeneratedItems.add(MaterialsUEVplus.TranscendentMetal);
- arrowGtWood.mNotGeneratedItems.add(MaterialsUEVplus.TranscendentMetal);
stickLong.mNotGeneratedItems.add(Materials.Obsidian);
dust.mNotGeneratedItems.add(Materials.CertusQuartzCharged);
@@ -979,8 +964,6 @@ public enum OrePrefixes {
toolHeadWrench.mSecondaryMaterial = new MaterialStack(
Materials.Steel,
ring.mMaterialAmount + screw.mMaterialAmount * 2);
- arrowGtWood.mSecondaryMaterial = new MaterialStack(Materials.Wood, stick.mMaterialAmount);
- arrowGtPlastic.mSecondaryMaterial = new MaterialStack(Materials.Plastic, stick.mMaterialAmount);
bulletGtSmall.mSecondaryMaterial = new MaterialStack(Materials.Brass, ingot.mMaterialAmount / 9);
bulletGtMedium.mSecondaryMaterial = new MaterialStack(Materials.Brass, ingot.mMaterialAmount / 6);
bulletGtLarge.mSecondaryMaterial = new MaterialStack(Materials.Brass, ingot.mMaterialAmount / 3);
@@ -1046,7 +1029,6 @@ public enum OrePrefixes {
OrePrefixes.toolHeadUniversalSpade,
OrePrefixes.toolHeadSense,
OrePrefixes.toolHeadPlow,
- OrePrefixes.toolHeadArrow,
OrePrefixes.toolHeadBuzzSaw,
OrePrefixes.turbineBlade,
OrePrefixes.wireFine,
@@ -1055,8 +1037,6 @@ public enum OrePrefixes {
OrePrefixes.stickLong,
OrePrefixes.springSmall,
OrePrefixes.spring,
- OrePrefixes.arrowGtWood,
- OrePrefixes.arrowGtPlastic,
OrePrefixes.gemChipped,
OrePrefixes.gemFlawed,
OrePrefixes.gemFlawless,
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index e09901b03b..72b74c3f97 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -4411,86 +4411,6 @@ public class GT_Utility {
}
}
- /**
- * THIS IS BULLSHIT!!! WHY DO I HAVE TO DO THIS SHIT JUST TO HAVE ENCHANTS PROPERLY!?!
- */
- public static class GT_EnchantmentHelper {
-
- private static final BullshitIteratorA mBullshitIteratorA = new BullshitIteratorA();
- private static final BullshitIteratorB mBullshitIteratorB = new BullshitIteratorB();
-
- private static void applyBullshit(IBullshit aBullshitModifier, ItemStack aStack) {
- if (aStack != null) {
- NBTTagList nbttaglist = aStack.getEnchantmentTagList();
- if (nbttaglist != null) {
- try {
- for (int i = 0; i < nbttaglist.tagCount(); ++i) {
- short short1 = nbttaglist.getCompoundTagAt(i)
- .getShort("id");
- short short2 = nbttaglist.getCompoundTagAt(i)
- .getShort("lvl");
- if (Enchantment.enchantmentsList[short1] != null)
- aBullshitModifier.calculateModifier(Enchantment.enchantmentsList[short1], short2);
- }
- } catch (Throwable e) {
- /**/
- }
- }
- }
- }
-
- private static void applyArrayOfBullshit(IBullshit aBullshitModifier, ItemStack[] aStacks) {
- for (ItemStack itemstack : aStacks) {
- applyBullshit(aBullshitModifier, itemstack);
- }
- }
-
- public static void applyBullshitA(EntityLivingBase aPlayer, Entity aEntity, ItemStack aStack) {
- mBullshitIteratorA.mPlayer = aPlayer;
- mBullshitIteratorA.mEntity = aEntity;
- if (aPlayer != null) applyArrayOfBullshit(mBullshitIteratorA, aPlayer.getLastActiveItems());
- if (aStack != null) applyBullshit(mBullshitIteratorA, aStack);
- }
-
- public static void applyBullshitB(EntityLivingBase aPlayer, Entity aEntity, ItemStack aStack) {
- mBullshitIteratorB.mPlayer = aPlayer;
- mBullshitIteratorB.mEntity = aEntity;
- if (aPlayer != null) applyArrayOfBullshit(mBullshitIteratorB, aPlayer.getLastActiveItems());
- if (aStack != null) applyBullshit(mBullshitIteratorB, aStack);
- }
-
- interface IBullshit {
-
- void calculateModifier(Enchantment aEnchantment, int aLevel);
- }
-
- static final class BullshitIteratorA implements IBullshit {
-
- public EntityLivingBase mPlayer;
- public Entity mEntity;
-
- BullshitIteratorA() {}
-
- @Override
- public void calculateModifier(Enchantment aEnchantment, int aLevel) {
- aEnchantment.func_151367_b(mPlayer, mEntity, aLevel);
- }
- }
-
- static final class BullshitIteratorB implements IBullshit {
-
- public EntityLivingBase mPlayer;
- public Entity mEntity;
-
- BullshitIteratorB() {}
-
- @Override
- public void calculateModifier(Enchantment aEnchantment, int aLevel) {
- aEnchantment.func_151368_a(mPlayer, mEntity, aLevel);
- }
- }
- }
-
public static String toSubscript(long no) {
char[] chars = Long.toString(no)
.toCharArray();
generated by cgit (git 2.46.0) at 2025-12-05 16:17:35 +0000