aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/forestry/bees/custom
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-09 01:08:26 +0200
committerGitHub <noreply@github.com>2023-04-09 01:08:26 +0200
commit26caa265b7eae49767947e1ff4e6cfc8166b07f5 (patch)
tree0fc0332da7a843cf153bf75fcc2e20601bbf18ee /src/main/java/gtPlusPlus/xmod/forestry/bees/custom
parentc33b3ba66194c7441fbd437530d21a51aa4395d5 (diff)
downloadGT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.gz
GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.bz2
GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.zip
clean up GT++ code (#589)
* yeet big reactor support * yeet IC2 classic support * yeet pneumaticraft support * yeet More Planets support * yeet Immersive Engineering support * yeet Psychedilicraft support * yeet Beyond Reality Core support * sort mods to see what must be purged * yeet simply jetpacks * yeet RFTools * yeet xReliquary * yeet RedTech * yeet Mekanism * yeet GrowthCraft * yeet ihl * leftover cleaning * yeet thermal fondation support * yeet compact windmills support * spotless * remove constants from LoadedMods (part 1 / 2) * spotless * remove constants from LoadedMods (part 2 / 2) * use mod id enum instead of strings + optimize imports * Loaded.isModLoaded -> enum * restore RA init * missing ! * start organizing recipes stuff * fix crash on world load in dev * remove unused class * remove HazmatUtils.java * move all the removals * remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack) * move some pyrolyse oven recipes to its own file * sa * bump GT version * bump GT5U version * spotless apply * use Everglades entry from the mod enum --------- Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/forestry/bees/custom')
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java10
3 files changed, 23 insertions, 28 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
index 00799a1030..4c8912b21e 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
@@ -10,12 +10,22 @@ import net.minecraftforge.common.BiomeDictionary.Type;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.commons.lang3.text.WordUtils;
-import forestry.api.apiculture.*;
+import forestry.api.apiculture.BeeManager;
+import forestry.api.apiculture.EnumBeeChromosome;
+import forestry.api.apiculture.EnumBeeType;
+import forestry.api.apiculture.IAlleleBeeSpecies;
+import forestry.api.apiculture.IAlleleBeeSpeciesCustom;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeMutationCustom;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
-import forestry.apiculture.genetics.*;
+import forestry.apiculture.genetics.Bee;
+import forestry.apiculture.genetics.BeeDefinition;
+import forestry.apiculture.genetics.BeeVariation;
+import forestry.apiculture.genetics.IBeeDefinition;
import forestry.core.genetics.alleles.AlleleHelper;
import gregtech.loaders.misc.GT_BeeDefinition;
import gtPlusPlus.api.objects.Logger;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
index f5d37817ff..d27f478169 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.forestry.bees.custom;
+import static gregtech.api.enums.Mods.Forestry;
+
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -10,9 +12,6 @@ import net.minecraftforge.fluids.FluidStack;
import org.apache.commons.lang3.reflect.FieldUtils;
-import cpw.mods.fml.common.Loader;
-import forestry.api.genetics.AlleleManager;
-import forestry.api.genetics.IAllele;
import gregtech.GT_Mod;
import gregtech.api.enums.Materials;
import gtPlusPlus.api.objects.Logger;
@@ -48,15 +47,7 @@ public class GTPP_Bees {
// public static GTPP_Branch_Definition definition;
public GTPP_Bees() {
- if (Loader.isModLoaded("Forestry") /* && tryGetBeesBoolean() */) {
-
- for (IAllele o : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
- // Utils.LOG_DEBUG_BEES(" ==================================================");
- // Utils.LOG_DEBUG_BEES(" Name: "+o.getName());
- // Utils.LOG_DEBUG_BEES(" Name: "+o.getUnlocalizedName());
- // Utils.LOG_DEBUG_BEES(" getUID: "+o.getUID());
- // Utils.LOG_DEBUG_BEES(" isDominant: "+o.isDominant());
- }
+ if (Forestry.isModLoaded()) {
// Set Materials and Comb stacks from GT via Reflection
setMaterials();
@@ -75,20 +66,13 @@ public class GTPP_Bees {
private void setCustomItems() {
dropForceGem = new BaseItemMisc("Force", new short[] { 250, 250, 20 }, 64, MiscTypes.GEM, null);
- // MaterialUtils.tryEnableMaterial(Materials.Force);
- // MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Force);
- // MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Force);
dropBiomassBlob = new BaseItemMisc("Biomass", new short[] { 33, 225, 24 }, 64, MiscTypes.DROP, null);
dropEthanolBlob = new BaseItemMisc("Ethanol", new short[] { 255, 128, 0 }, 64, MiscTypes.DROP, null);
// Nikolite may not exist, so lets make it.
dropNikoliteDust = ItemUtils
.generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2];
- // MaterialUtils.tryEnableMaterial(Materials.Nikolite);
- // MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Nikolite);
- // MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Nikolite);
- // MaterialUtils.tryEnableMaterialPart(OrePrefixes.plate, Materials.Nikolite);
- // MaterialUtils.tryEnableMaterial(Materials.BlueAlloy);
+
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotNikolite", 1) == null) {
new BaseItemIngot_OLD("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0);
}
@@ -160,9 +144,6 @@ public class GTPP_Bees {
if (Comb_Stone == null) {
Comb_Stone = (ItemStack) getStackForType.invoke(gtBees, gtCombTypeStone);
}
- /*
- * } else { Utils.LOG_BEES("oCombObject was not an instance of gregtech.common.items.ItemComb"); }
- */
} catch (NullPointerException | ClassNotFoundException | IllegalArgumentException | IllegalAccessException
| NoSuchMethodException | SecurityException | InvocationTargetException e) {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
index 43ab2fb191..a7896ab662 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.forestry.bees.custom;
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -13,10 +15,12 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import gregtech.GT_Mod;
-import gregtech.api.enums.*;
+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_OreDictUnificator;
import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
public class ItemCustomComb extends Item {
@@ -29,7 +33,7 @@ public class ItemCustomComb extends Item {
this.setCreativeTab(Tabs.tabApiculture);
this.setHasSubtypes(true);
this.setUnlocalizedName("gtpp.comb");
- GameRegistry.registerItem(this, "gtpp.comb", CORE.MODID);
+ GameRegistry.registerItem(this, "gtpp.comb", GTPlusPlus.ID);
}
public ItemStack getStackForType(CustomCombs type) {