aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/forestry/bees
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/forestry/bees')
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java)78
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java)26
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java)10
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java30
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPCombType.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java)14
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPDropType.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java)14
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPollenType.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java)14
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPropolisType.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java)14
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java)56
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRStringUtil.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java)2
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBFrameType.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java)8
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java)8
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPComb.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java)48
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPDrop.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java)26
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPollen.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java)18
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPropolis.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java)24
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FRGregTechRecipes.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java)30
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPPAlleleBeeSpecies.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_AlleleBeeSpecies.java)4
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPPBeeMutation.java (renamed from src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java)5
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java49
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java61
22 files changed, 273 insertions, 274 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
index d908850658..05ab3c8711 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
@@ -1,7 +1,7 @@
package gtPlusPlus.xmod.forestry.bees.custom;
import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
import gtPlusPlus.core.util.Utils;
public enum CustomCombs {
@@ -11,8 +11,8 @@ public enum CustomCombs {
SILICON("silicon", true, Materials.Silicon, 100),
RUBBER("rubber", true, Materials.Rubber, 100),
PLASTIC("polyethylene", true, Materials.Plastic, 75),
- PTFE("polytetrafluoroethylene", true, GTPP_Bees.PTFE, 50),
- PBS("styrene-butadiene", true, GTPP_Bees.PBS, 25),
+ PTFE("polytetrafluoroethylene", true, GTPPBees.PTFE, 50),
+ PBS("styrene-butadiene", true, GTPPBees.PBS, 25),
// Fuels
BIOMASS("biomass", true, Materials.Biomass, 100),
@@ -82,7 +82,7 @@ public enum CustomCombs {
public String getName() {
// return "gt.comb."+this.name;
- return GT_LanguageManager.addStringLocalization(
+ return GTLanguageManager.addStringLocalization(
"comb." + this.name,
this.name.substring(0, 1)
.toUpperCase() + this.name.substring(1) + " Comb");
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java
index 0cdb49a9b5..7f7553bf1d 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java
@@ -27,21 +27,21 @@ 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 gregtech.loaders.misc.GTBeeDefinition;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-public enum GTPP_Bee_Definition implements IBeeDefinition {
+public enum GTPPBeeDefinition implements IBeeDefinition {
- SILICON(GTPP_Branch_Definition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75),
+ SILICON(GTPPBranchDefinition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75),
Utils.rgbtoHexValue(125, 125, 125)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getSlagComb(), 0.10f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SILICON), 0.20f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SILICON), 0.20f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.NORMAL);
}
@@ -60,13 +60,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
}
},
- RUBBER(GTPP_Branch_Definition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55),
+ RUBBER(GTPPBranchDefinition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55),
Utils.rgbtoHexValue(75, 75, 75)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getSlagComb(), 0.10f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.RUBBER), 0.30f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.RUBBER), 0.30f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.NORMAL);
}
@@ -85,13 +85,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
}
},
- PLASTIC(GTPP_Branch_Definition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245),
+ PLASTIC(GTPPBranchDefinition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245),
Utils.rgbtoHexValue(175, 175, 175)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getStoneComb(), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PLASTIC), 0.15f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.PLASTIC), 0.15f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.NORMAL);
}
@@ -107,13 +107,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
}
},
- PTFE(GTPP_Branch_Definition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150),
+ PTFE(GTPPBranchDefinition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150),
Utils.rgbtoHexValue(75, 75, 75)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getStoneComb(), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PTFE), 0.10f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.PTFE), 0.10f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.NORMAL);
}
@@ -129,12 +129,12 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
}
},
- PBS(GTPP_Branch_Definition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) {
+ PBS(GTPPBranchDefinition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getStoneComb(), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PBS), 0.10f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.PBS), 0.10f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.NORMAL);
}
@@ -153,13 +153,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
/**
* Fuels
*/
- BIOMASS(GTPP_Branch_Definition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24),
+ BIOMASS(GTPPBranchDefinition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24),
Utils.rgbtoHexValue(23, 175, 14)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.40f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.BIOMASS), 0.20f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SAND), 0.40f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.BIOMASS), 0.20f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.NORMAL);
}
@@ -176,13 +176,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
}
},
- ETHANOL(GTPP_Branch_Definition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0),
+ ETHANOL(GTPPBranchDefinition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0),
Utils.rgbtoHexValue(220, 156, 32)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.40f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.ETHANOL), 0.20f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SAND), 0.40f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.ETHANOL), 0.20f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.NORMAL);
}
@@ -202,13 +202,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
/**
* Materials
*/
- FLUORINE(GTPP_Branch_Definition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230),
+ FLUORINE(GTPPBranchDefinition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230),
Utils.rgbtoHexValue(10, 150, 150)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getStoneComb(), 0.40f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.FLUORINE), 0.05f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.FLUORINE), 0.05f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.COLD);
}
@@ -231,15 +231,15 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
// Coke
// Force
- FORCE(GTPP_Branch_Definition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20),
+ FORCE(GTPPBranchDefinition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20),
Utils.rgbtoHexValue(200, 200, 5)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getStoneComb(), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.25f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.FORCE), 0.25f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SALT), 0.05f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SAND), 0.25f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.FORCE), 0.25f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SALT), 0.05f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.HOT);
}
@@ -260,13 +260,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
},
// Nikolite
- NIKOLITE(GTPP_Branch_Definition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200),
+ NIKOLITE(GTPPBranchDefinition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200),
Utils.rgbtoHexValue(40, 150, 170)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getStoneComb(), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.NIKOLITE), 0.05f);
+ beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.NIKOLITE), 0.05f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.HOT);
}
@@ -289,7 +289,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
/*
* CLAY(GTPP_Branch_Definition.ORGANIC, "Clay", true, 0x19d0ec, 0xffdc16) {
* @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
+ * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
* beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f); beeSpecies.setHumidity(EnumHumidity.DAMP);
* beeSpecies.setTemperature(EnumTemperature.NORMAL); }
* @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MEADOWS.getTemplate(); }
@@ -297,7 +297,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
* registerMutation(getSpecies("Industrious"), getSpecies("Diligent"), 20); } },
* SLIMEBALL(GTPP_Branch_Definition.ORGANIC, "SlimeBall", true, 0x4E9E55, 0x00FF15) {
* @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f);
+ * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f);
* beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STICKY), 0.30f);
* beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
* @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MARSHY.getTemplate(); }
@@ -306,14 +306,14 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
* 0x906237, 0x58300B) {
* @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
* beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LIGNIE), 0.30f);
- * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f);
+ * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f);
* beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
* @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.RURAL.getTemplate(); }
* @Override protected void registerMutations() { IBeeMutationCustom tMutation =
* registerMutation(getSpecies("Rural"), CLAY.species, 20); } }, STICKYRESIN(GTPP_Branch_Definition.ORGANIC,
* "StickyResin", true, 0x2E8F5B, 0xDCC289) {
* @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
+ * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
* beeSpecies.addProduct(ItemList.IC2_Resin.get(1, new Object[0]), 0.15f);
* beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
* @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MEADOWS.getTemplate(); }
@@ -328,7 +328,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
* registerMutation(getSpecies("Industrious"), PEAT.species, 18); } }, OIL(GTPP_Branch_Definition.ORGANIC, "Oil",
* true, 0x4C4C4C, 0x333333) {
* @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
+ * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
* beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.OIL), 0.15f);
* beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL);
* beeSpecies.setNocturnal(); }
@@ -476,13 +476,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
;
- private final GTPP_Branch_Definition branch;
+ private final GTPPBranchDefinition branch;
private final IAlleleBeeSpeciesCustom species;
private IAllele[] template;
private IBeeGenome genome;
- GTPP_Bee_Definition(GTPP_Branch_Definition branch, String binomial, boolean dominant, int primary, int secondary) {
+ GTPPBeeDefinition(GTPPBranchDefinition branch, String binomial, boolean dominant, int primary, int secondary) {
String lowercaseName = this.toString()
.toLowerCase(Locale.ENGLISH);
String species = "species" + WordUtils.capitalize(lowercaseName);
@@ -505,10 +505,10 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
}
public static void initBees() {
- for (GTPP_Bee_Definition bee : values()) {
+ for (GTPPBeeDefinition bee : values()) {
bee.init();
}
- for (GTPP_Bee_Definition bee : values()) {
+ for (GTPPBeeDefinition bee : values()) {
bee.registerMutations();
}
}
@@ -574,11 +574,11 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
}
private static ItemStack getSlagComb() {
- return issStackValid(ItemUtils.getSimpleStack(GTPP_Bees.Comb_Slag, 1));
+ return issStackValid(ItemUtils.getSimpleStack(GTPPBees.Comb_Slag, 1));
}
private static ItemStack getStoneComb() {
- return issStackValid(ItemUtils.getSimpleStack(GTPP_Bees.Comb_Stone, 1));
+ return issStackValid(ItemUtils.getSimpleStack(GTPPBees.Comb_Stone, 1));
}
private static ItemStack issStackValid(ItemStack result) {
@@ -590,8 +590,8 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
public static IAlleleBeeSpecies getGregtechBeeType(String name) {
try {
- Enum<GT_BeeDefinition> gtBeeEnumObject = Enum.valueOf(GT_BeeDefinition.class, name);
- Field gtBeesField = FieldUtils.getDeclaredField(GT_BeeDefinition.class, "species", true);
+ Enum<GTBeeDefinition> gtBeeEnumObject = Enum.valueOf(GTBeeDefinition.class, name);
+ Field gtBeesField = FieldUtils.getDeclaredField(GTBeeDefinition.class, "species", true);
gtBeesField.setAccessible(true);
ReflectionUtils.makeFieldAccessible(gtBeesField);
Object beeType = gtBeesField.get(gtBeeEnumObject);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java
index 4d04e3ad31..f0cd284bdf 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java
@@ -2,8 +2,8 @@ package gtPlusPlus.xmod.forestry.bees.custom;
import static gregtech.api.enums.Mods.Forestry;
import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -15,11 +15,11 @@ import net.minecraftforge.fluids.FluidStack;
import org.apache.commons.lang3.reflect.FieldUtils;
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD;
+import gtPlusPlus.core.item.base.ingots.BaseItemIngotOld;
import gtPlusPlus.core.item.base.misc.BaseItemMisc;
import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes;
import gtPlusPlus.core.util.Utils;
@@ -27,7 +27,7 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-public class GTPP_Bees {
+public class GTPPBees {
// Custom Comb Drop Base Items
public static Item dropForceGem;
@@ -49,7 +49,7 @@ public class GTPP_Bees {
// public static GTPP_Branch_Definition definition;
- public GTPP_Bees() {
+ public GTPPBees() {
if (Forestry.isModLoaded()) {
// Set Materials and Comb stacks from GT via Reflection
@@ -59,7 +59,7 @@ public class GTPP_Bees {
try {
combs = new ItemCustomComb();
combs.initCombsRecipes();
- GTPP_Bee_Definition.initBees();
+ GTPPBeeDefinition.initBees();
} catch (Throwable t) {
Logger.BEES("Failed to load bees, probably due to an ancient forestry version");
t.printStackTrace();
@@ -77,7 +77,7 @@ public class GTPP_Bees {
.generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2];
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotNikolite", 1) == null) {
- new BaseItemIngot_OLD("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0);
+ new BaseItemIngotOld("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0);
}
dropFluorineBlob = new BaseItemMisc("Fluorine", new short[] { 30, 230, 230 }, 64, MiscTypes.DROP, null);
@@ -91,7 +91,7 @@ public class GTPP_Bees {
}
private void addExtractorRecipe(ItemStack input, FluidStack output) {
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(input)
.fluidOutputs(output)
.duration(1 * SECONDS + 10 * TICKS)
@@ -101,9 +101,9 @@ public class GTPP_Bees {
private static boolean tryGetBeesBoolean() {
try {
- Class<?> mProxy = Class.forName("gregtech.GT_Mod.gregtechproxy");
+ Class<?> mProxy = Class.forName("gregtech.GTMod.gregtechproxy");
Field mNerf = FieldUtils.getDeclaredField(mProxy, "mGTBees", true);
- boolean returnValue = (boolean) mNerf.get(GT_Mod.gregtechproxy);
+ boolean returnValue = (boolean) mNerf.get(GTMod.gregtechproxy);
return returnValue;
} catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException e) {
return false;
@@ -113,7 +113,7 @@ public class GTPP_Bees {
private void setMaterials() {
try {
- Class<?> gtBees = Class.forName("gregtech.loaders.misc.GT_Bees");
+ Class<?> gtBees = Class.forName("gregtech.loaders.misc.GTBees");
Class<?> gtCombItemClass = Class.forName("gregtech.common.items.ItemComb");
Class gtCombEnumClass = Class.forName("gregtech.common.items.CombType");
Field gtCombs = FieldUtils.getDeclaredField(gtBees, "combs", true);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java
index 94e6078c49..ca35849172 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java
@@ -7,7 +7,7 @@ import forestry.api.genetics.IAllele;
import forestry.api.genetics.IClassification;
import gtPlusPlus.api.objects.Logger;
-public enum GTPP_Branch_Definition {
+public enum GTPPBranchDefinition {
ORGANIC("ORGANIC"),
GEM("GEM"),
@@ -18,7 +18,7 @@ public enum GTPP_Branch_Definition {
final String mFieldName;
final Enum mActualValues;
- GTPP_Branch_Definition(String mValue) {
+ GTPPBranchDefinition(String mValue) {
this.mFieldName = mValue;
this.mActualValues = setEnumVar(mValue);
}
@@ -26,7 +26,7 @@ public enum GTPP_Branch_Definition {
public final IAllele[] getTemplate() {
Class gtBranchDefClass;
try {
- gtBranchDefClass = Class.forName("gregtech.loaders.misc.GT_BranchDefinition");
+ gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition");
Enum enumA = mActualValues;
Method methodMyMethod = gtBranchDefClass.getMethod("getTemplate");
@@ -47,7 +47,7 @@ public enum GTPP_Branch_Definition {
public final IClassification getBranch() {
Class gtBranchDefClass;
try {
- gtBranchDefClass = Class.forName("gregtech.loaders.misc.GT_BranchDefinition");
+ gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition");
Enum enum_MY_SAMPLE_ENUM = mActualValues;
Method methodMyMethod = gtBranchDefClass.getMethod("getBranch");
@@ -66,7 +66,7 @@ public enum GTPP_Branch_Definition {
private Enum setEnumVar(String value) {
try {
- Class gtBranchDefClass = Class.forName("gregtech.loaders.misc.GT_BranchDefinition");
+ Class gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition");
Enum branchDef = Enum.valueOf(gtBranchDefClass, value);
return branchDef;
} catch (ClassNotFoundException 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 63c0ae53ec..0ff3625a25 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
@@ -2,8 +2,8 @@ package gtPlusPlus.xmod.forestry.bees.custom;
import static gregtech.api.enums.Mods.GTPlusPlus;
import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
import java.util.List;
@@ -17,11 +17,11 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
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.GTOreDictUnificator;
import gtPlusPlus.core.util.minecraft.ItemUtils;
public class ItemCustomComb extends Item {
@@ -101,37 +101,37 @@ public class ItemCustomComb extends Item {
ItemStack tComb;
tComb = getStackForType(CustomCombs.SILICON);
- addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silicon, 1), 30);
+ addSpecialCent(tComb, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silicon, 1), 30);
// addProcess(tComb, Materials.Silver, 100);
// addProcess(tComb, Materials.Galena, 100);
// Rubbers
tComb = getStackForType(CustomCombs.RUBBER);
- addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rubber, 1), 30);
+ addSpecialCent(tComb, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rubber, 1), 30);
tComb = getStackForType(CustomCombs.PLASTIC);
- addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plastic, 1), 20);
+ addSpecialCent(tComb, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plastic, 1), 20);
tComb = getStackForType(CustomCombs.PTFE);
- addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, GTPP_Bees.PTFE, 1), 10);
+ addSpecialCent(tComb, GTOreDictUnificator.get(OrePrefixes.dustTiny, GTPPBees.PTFE, 1), 10);
tComb = getStackForType(CustomCombs.PBS);
- addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, GTPP_Bees.PBS, 1), 5);
+ addSpecialCent(tComb, GTOreDictUnificator.get(OrePrefixes.dustTiny, GTPPBees.PBS, 1), 5);
// Fuels
tComb = getStackForType(CustomCombs.BIOMASS);
- addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropBiomassBlob), 5);
+ addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPPBees.dropBiomassBlob), 5);
tComb = getStackForType(CustomCombs.PBS);
- addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropEthanolBlob), 5);
+ addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPPBees.dropEthanolBlob), 5);
// Misc Materials
tComb = getStackForType(CustomCombs.FORCE);
- addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropForceGem), 5);
+ addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPPBees.dropForceGem), 5);
tComb = getStackForType(CustomCombs.FLUORINE);
- addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropFluorineBlob), 5);
+ addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPPBees.dropFluorineBlob), 5);
tComb = getStackForType(CustomCombs.NIKOLITE);
- addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropNikoliteDust), 5);
+ addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPPBees.dropNikoliteDust), 5);
}
public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance) {
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(tComb)
.itemOutputs(aOutput, ItemList.FR_Wax.get(1))
.outputChances(chance * 100, 3000)
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPCombType.java
index be1aa48d3c..6c594fc83a 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPCombType.java
@@ -2,12 +2,12 @@ package gtPlusPlus.xmod.forestry.bees.handler;
import net.minecraft.item.ItemStack;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-public enum GTPP_CombType {
+public enum GTPPCombType {
DRAGONBLOOD(0, "Dragonblood", true, 30, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20)),
FORCE(1, "Force", true, 30, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5));
@@ -21,15 +21,15 @@ public enum GTPP_CombType {
private final String mNameUnlocal;
private final int[] mColour;
- private static void map(int aId, GTPP_CombType aType) {
+ private static void map(int aId, GTPPCombType aType) {
GTPP_Bees.sCombMappings.put(aId, aType);
}
- public static GTPP_CombType get(int aID) {
+ public static GTPPCombType get(int aID) {
return GTPP_Bees.sCombMappings.get(aID);
}
- GTPP_CombType(int aID, String aName, boolean aShow, int aChance, int... aColour) {
+ GTPPCombType(int aID, String aName, boolean aShow, int aChance, int... aColour) {
this.mID = aID;
this.mName = aName;
this.mNameUnlocal = aName.toLowerCase()
@@ -41,7 +41,7 @@ public enum GTPP_CombType {
this.mMaterial = GTPP_Bees.sMaterialMappings.get(
aName.toLowerCase()
.replaceAll(" ", ""));
- GT_LanguageManager.addStringLocalization("gtplusplus.comb." + this.mNameUnlocal, this.mName + " Comb");
+ GTLanguageManager.addStringLocalization("gtplusplus.comb." + this.mNameUnlocal, this.mName + " Comb");
}
public void setHidden() {
@@ -49,7 +49,7 @@ public enum GTPP_CombType {
}
public String getName() {
- return GT_LanguageManager.getTranslation("gtplusplus.comb." + this.mNameUnlocal);
+ return GTLanguageManager.getTranslation("gtplusplus.comb." + this.mNameUnlocal);
}
public int[] getColours() {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPDropType.java
index 089b8cebf1..0ae34d599c 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPDropType.java
@@ -2,12 +2,12 @@ package gtPlusPlus.xmod.forestry.bees.handler;
import net.minecraft.item.ItemStack;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-public enum GTPP_DropType {
+public enum GTPPDropType {
DRAGONBLOOD(0, "Dragonblood", true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20)),
FORCE(1, "Force", true, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5));
@@ -21,15 +21,15 @@ public enum GTPP_DropType {
private final String mNameUnlocal;
private final int[] mColour;
- private static void map(int aId, GTPP_DropType aType) {
+ private static void map(int aId, GTPPDropType aType) {
GTPP_Bees.sDropMappings.put(aId, aType);
}
- public static GTPP_DropType get(int aID) {
+ public static GTPPDropType get(int aID) {
return GTPP_Bees.sDropMappings.get(aID);
}
- private GTPP_DropType(int aID, String aName, boolean aShow, int... aColour) {
+ private GTPPDropType(int aID, String aName, boolean aShow, int... aColour) {
this.mID = aID;
this.mName = aName;
this.mNameUnlocal = aName.toLowerCase()
@@ -40,7 +40,7 @@ public enum GTPP_DropType {
this.mMaterial = GTPP_Bees.sMaterialMappings.get(
aName.toLowerCase()
.replaceAll(" ", ""));
- GT_LanguageManager.addStringLocalization("gtplusplus.drop." + this.mNameUnlocal, this.mName + " Drop");
+ GTLanguageManager.addStringLocalization("gtplusplus.drop." + this.mNameUnlocal, this.mName + " Drop");
}
public void setHidden() {
@@ -48,7 +48,7 @@ public enum GTPP_DropType {
}
public String getName() {
- return GT_LanguageManager.getTranslation("gtplusplus.drop." + this.mNameUnlocal);
+ return GTLanguageManager.getTranslation("gtplusplus.drop." + this.mNameUnlocal);
}
public int[] getColours() {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPollenType.java
index 56a8f37daf..08b8f84dca 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPollenType.java
@@ -2,12 +2,12 @@ package gtPlusPlus.xmod.forestry.bees.handler;
import net.minecraft.item.ItemStack;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-public enum GTPP_PollenType {
+public enum GTPPPollenType {
DRAGONBLOOD(0, "Dragonblood", true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20));
@@ -20,15 +20,15 @@ public enum GTPP_PollenType {
private final String mNameUnlocal;
private final int[] mColour;
- private static void map(int aId, GTPP_PollenType aType) {
+ private static void map(int aId, GTPPPollenType aType) {
GTPP_Bees.sPollenMappings.put(aId, aType);
}
- public static GTPP_PollenType get(int aID) {
+ public static GTPPPollenType get(int aID) {
return GTPP_Bees.sPollenMappings.get(aID);
}
- private GTPP_PollenType(int aID, String aName, boolean aShow, int... aColour) {
+ private GTPPPollenType(int aID, String aName, boolean aShow, int... aColour) {
this.mID = aID;
this.mName = aName;
this.mNameUnlocal = aName.toLowerCase()
@@ -39,7 +39,7 @@ public enum GTPP_PollenType {
this.mMaterial = GTPP_Bees.sMaterialMappings.get(
aName.toLowerCase()
.replaceAll(" ", ""));
- GT_LanguageManager.addStringLocalization("gtplusplus.pollen." + this.mNameUnlocal, this.mName + " Pollen");
+ GTLanguageManager.addStringLocalization("gtplusplus.pollen." + this.mNameUnlocal, this.mName + " Pollen");
}
public void setHidden() {
@@ -47,7 +47,7 @@ public enum GTPP_PollenType {
}
public String getName() {
- return GT_LanguageManager.getTranslation("gtplusplus.pollen." + this.mNameUnlocal);
+ return GTLanguageManager.getTranslation("gtplusplus.pollen." + this.mNameUnlocal);
}
public int[] getColours() {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPropolisType.java
index fc70d6232e..f97da9f4df 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPropolisType.java
@@ -2,12 +2,12 @@ package gtPlusPlus.xmod.forestry.bees.handler;
import net.minecraft.item.ItemStack;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-public enum GTPP_PropolisType {
+public enum GTPPPropolisType {
DRAGONBLOOD(0, "Dragonblood", true, Utils.rgbtoHexValue(220, 20, 20)),
FORCE(1, "Force", true, Utils.rgbtoHexValue(250, 250, 20));
@@ -21,15 +21,15 @@ public enum GTPP_PropolisType {
private final String mNameUnlocal;
private final int mColour;
- private static void map(int aId, GTPP_PropolisType aType) {
+ private static void map(int aId, GTPPPropolisType aType) {
GTPP_Bees.sPropolisMappings.put(aId, aType);
}
- public static GTPP_PropolisType get(int aID) {
+ public static GTPPPropolisType get(int aID) {
return GTPP_Bees.sPropolisMappings.get(aID);
}
- private GTPP_PropolisType(int aID, String aName, boolean aShow, int aColour) {
+ private GTPPPropolisType(int aID, String aName, boolean aShow, int aColour) {
this.mID = aID;
this.mName = aName;
this.mNameUnlocal = aName.toLowerCase()
@@ -40,7 +40,7 @@ public enum GTPP_PropolisType {
this.mMaterial = GTPP_Bees.sMaterialMappings.get(
aName.toLowerCase()
.replaceAll(" ", ""));
- GT_LanguageManager.addStringLocalization("gtplusplus.propolis." + this.mNameUnlocal, this.mName + " Propolis");
+ GTLanguageManager.addStringLocalization("gtplusplus.propolis." + this.mNameUnlocal, this.mName + " Propolis");
}
public void setHidden() {
@@ -48,7 +48,7 @@ public enum GTPP_PropolisType {
}
public String getName() {
- return GT_LanguageManager.getTranslation("gtplusplus.propolis." + this.mNameUnlocal);
+ return GTLanguageManager.getTranslation("gtplusplus.propolis." + this.mNameUnlocal);
}
public int getColours() {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java
index b61a91710e..ab2353cc37 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java
@@ -19,28 +19,28 @@ import cpw.mods.fml.common.registry.GameRegistry;
import forestry.core.utils.StringUtil;
import gregtech.api.enums.Mods;
-public class FR_ItemRegistry {
+public class FRItemRegistry {
// ----- Apiary Frames ----------------------
// Magic Bee Frame Items
- public static MB_ItemFrame hiveFrameAccelerated;
- public static MB_ItemFrame hiveFrameVoid;
- public static MB_ItemFrame hiveFrameMutagenic;
- public static MB_ItemFrame hiveFrameBusy;
+ public static MBItemFrame hiveFrameAccelerated;
+ public static MBItemFrame hiveFrameVoid;
+ public static MBItemFrame hiveFrameMutagenic;
+ public static MBItemFrame hiveFrameBusy;
// Extra Bee Frame Items
- public static MB_ItemFrame hiveFrameCocoa;
- public static MB_ItemFrame hiveFrameCaged;
- public static MB_ItemFrame hiveFrameSoul;
- public static MB_ItemFrame hiveFrameClay;
- public static MB_ItemFrame hiveFrameNova;
+ public static MBItemFrame hiveFrameCocoa;
+ public static MBItemFrame hiveFrameCaged;
+ public static MBItemFrame hiveFrameSoul;
+ public static MBItemFrame hiveFrameClay;
+ public static MBItemFrame hiveFrameNova;
// Frame Items added by bartimaeusnek
- public static MB_ItemFrame hiveFrameDecay;
- public static MB_ItemFrame hiveFrameSlow;
- public static MB_ItemFrame hiveFrameStalilize;
- public static MB_ItemFrame hiveFrameArborist;
+ public static MBItemFrame hiveFrameDecay;
+ public static MBItemFrame hiveFrameSlow;
+ public static MBItemFrame hiveFrameStalilize;
+ public static MBItemFrame hiveFrameArborist;
@Optional.Method(modid = Mods.Names.FORESTRY)
public static void Register() {
@@ -52,19 +52,19 @@ public class FR_ItemRegistry {
// Magic Bee like Frames
- hiveFrameVoid = new MB_ItemFrame(
- MB_FrameType.USELESS,
+ hiveFrameVoid = new MBItemFrame(
+ MBFrameType.USELESS,
EnumRarity.common,
"No more cheaty frames for GTNH players.");
- hiveFrameAccelerated = new MB_ItemFrame(
- MB_FrameType.ACCELERATED,
+ hiveFrameAccelerated = new MBItemFrame(
+ MBFrameType.ACCELERATED,
"Longevity for bees isn't very common, especially if they're working harder.");
- hiveFrameMutagenic = new MB_ItemFrame(
- MB_FrameType.MUTAGENIC,
+ hiveFrameMutagenic = new MBItemFrame(
+ MBFrameType.MUTAGENIC,
EnumRarity.epic,
"Evolution of the fittest, finest and fastest.");
- hiveFrameBusy = new MB_ItemFrame(MB_FrameType.BUSY, "Your bee will work harder and longer than you expected.");
+ hiveFrameBusy = new MBItemFrame(MBFrameType.BUSY, "Your bee will work harder and longer than you expected.");
ChestGenHooks.addItem(
ChestGenHooks.STRONGHOLD_CORRIDOR,
new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14));
@@ -91,17 +91,17 @@ public class FR_ItemRegistry {
new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 12));
// Frame Items added by bartimaeusnek
- hiveFrameDecay = new MB_ItemFrame(
- MB_FrameType.DECAYING,
+ hiveFrameDecay = new MBItemFrame(
+ MBFrameType.DECAYING,
EnumRarity.uncommon,
"Who really needs stable genetics?");
- hiveFrameSlow = new MB_ItemFrame(MB_FrameType.SLOWING, EnumRarity.common, "The journey is its own reward.");
- hiveFrameStalilize = new MB_ItemFrame(
- MB_FrameType.STABILIZING,
+ hiveFrameSlow = new MBItemFrame(MBFrameType.SLOWING, EnumRarity.common, "The journey is its own reward.");
+ hiveFrameStalilize = new MBItemFrame(
+ MBFrameType.STABILIZING,
EnumRarity.rare,
"If you wish your bees to keep their form.");
- hiveFrameArborist = new MB_ItemFrame(
- MB_FrameType.ARBORISTS,
+ hiveFrameArborist = new MBItemFrame(
+ MBFrameType.ARBORISTS,
EnumRarity.common,
"Who need Bees when you can have Trees?");
ChestGenHooks.addItem(
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRStringUtil.java
index c63401aecf..80b44268c5 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRStringUtil.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.items;
import net.minecraft.util.StatCollector;
-public class FR_StringUtil {
+public class FRStringUtil {
public static String getLocalizedString(final String key) {
if (StatCollector.canTranslate(key)) {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBFrameType.java
index 418c05587f..aaee356868 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBFrameType.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.forestry.bees.items;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeModifier;
-public enum MB_FrameType implements IBeeModifier {
+public enum MBFrameType implements IBeeModifier {
// ExtraBees Clone Frames
// Name, FrameHP, territory (1f), Mutation rate, lifespan rate, production rate, genetic decay (1f)
@@ -43,12 +43,12 @@ public enum MB_FrameType implements IBeeModifier {
private final boolean isSunlit;
private final boolean isHellish;
- MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
+ MBFrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
final float production, final float geneticDecay) {
this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false);
}
- MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
+ MBFrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
final float production, final float flowering, final float geneticDecay, final boolean sealed,
final boolean lit, final boolean sunlit, final boolean hellish) {
this.frameName = name;
@@ -71,7 +71,7 @@ public enum MB_FrameType implements IBeeModifier {
}
public String getLocalizedName() {
- return FR_StringUtil.getLocalizedString("frame." + this.frameName);
+ return FRStringUtil.getLocalizedString("frame." + this.frameName);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java
index e5d36d15e8..b196598f43 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java
@@ -21,17 +21,17 @@ import forestry.api.apiculture.IBeeModifier;
import forestry.api.apiculture.IHiveFrame;
import gtPlusPlus.core.creative.AddToCreativeTab;
-public class MB_ItemFrame extends Item implements IHiveFrame {
+public class MBItemFrame extends Item implements IHiveFrame {
- private final MB_FrameType type;
+ private final MBFrameType type;
private EnumRarity rarity_value = EnumRarity.uncommon;
private final String toolTip;
- public MB_ItemFrame(final MB_FrameType frameType, final String description) {
+ public MBItemFrame(final MBFrameType frameType, final String description) {
this(frameType, EnumRarity.uncommon, description);
}
- public MB_ItemFrame(final MB_FrameType frameType, final EnumRarity rarity, final String description) {
+ public MBItemFrame(final MBFrameType frameType, final EnumRarity rarity, final String description) {
super();
this.type = frameType;
this.setMaxDamage(this.type.maxDamage);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPComb.java
index 16f364f595..c77c7fcb8a 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPComb.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output;
import static gregtech.api.enums.Mods.Forestry;
import static gregtech.api.enums.Mods.GTPlusPlus;
-import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER;
+import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER;
import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes;
import java.util.List;
@@ -17,20 +17,20 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTModHandler;
import gtPlusPlus.core.material.Material;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPCombType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPDropType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPPropolisType;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-public class GTPP_Comb extends Item {
+public class GTPPComb extends Item {
@SideOnly(Side.CLIENT)
private IIcon secondIcon;
- public GTPP_Comb() {
+ public GTPPComb() {
super();
this.setCreativeTab(Tabs.tabApiculture);
this.setHasSubtypes(true);
@@ -38,18 +38,18 @@ public class GTPP_Comb extends Item {
GameRegistry.registerItem(this, "gtpp.comb", GTPlusPlus.ID);
}
- public ItemStack getStackForType(GTPP_CombType type) {
+ public ItemStack getStackForType(GTPPCombType type) {
return new ItemStack(this, 1, type.mID);
}
- public ItemStack getStackForType(GTPP_CombType type, int count) {
+ public ItemStack getStackForType(GTPPCombType type, int count) {
return new ItemStack(this, count, type.mID);
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tabs, List list) {
- for (GTPP_CombType type : GTPP_CombType.values()) {
+ for (GTPPCombType type : GTPPCombType.values()) {
if (type.mShowInList) {
list.add(this.getStackForType(type));
}
@@ -82,11 +82,11 @@ public class GTPP_Comb extends Item {
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int pass) {
- int colour = GTPP_CombType.get(stack.getItemDamage())
+ int colour = GTPPCombType.get(stack.getItemDamage())
.getColours()[0];
if (pass >= 1) {
- colour = GTPP_CombType.get(stack.getItemDamage())
+ colour = GTPPCombType.get(stack.getItemDamage())
.getColours()[1];
}
@@ -95,31 +95,31 @@ public class GTPP_Comb extends Item {
@Override
public String getItemStackDisplayName(ItemStack stack) {
- return GTPP_CombType.get(stack.getItemDamage())
+ return GTPPCombType.get(stack.getItemDamage())
.getName();
}
public static void initCombsRecipes() {
addChemicalRecipe(
- GTPP_CombType.DRAGONBLOOD,
- new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "refractoryWax", 1L, 0),
- GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.DRAGONBLOOD),
- GTPP_Bees.drop.getStackForType(GTPP_DropType.DRAGONBLOOD) },
+ GTPPCombType.DRAGONBLOOD,
+ new ItemStack[] { GTModHandler.getModItem(Forestry.ID, "refractoryWax", 1L, 0),
+ GTPP_Bees.propolis.getStackForType(GTPPPropolisType.DRAGONBLOOD),
+ GTPP_Bees.drop.getStackForType(GTPPDropType.DRAGONBLOOD) },
new int[] { 3000, 1500, 500 });
addChemicalRecipe(
- GTPP_CombType.FORCE,
- new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0),
- GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.FORCE),
- GTPP_Bees.drop.getStackForType(GTPP_DropType.FORCE) },
+ GTPPCombType.FORCE,
+ new ItemStack[] { GTModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0),
+ GTPP_Bees.propolis.getStackForType(GTPPPropolisType.FORCE),
+ GTPP_Bees.drop.getStackForType(GTPPDropType.FORCE) },
new int[] { 5000, 3000, 1000 });
}
- public static void addChemicalRecipe(GTPP_CombType aInputStack, ItemStack[] aOutputs, int[] aChances) {
+ public static void addChemicalRecipe(GTPPCombType aInputStack, ItemStack[] aOutputs, int[] aChances) {
Material aMat = aInputStack.mMaterial;
long aEU = aMat.vVoltageMultiplier;
int aTier = Math.max(aMat.vTier / 2, 1);
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(aInputStack.getStackForType(aTier))
.itemOutputs(aOutputs)
.duration(aTier * 20 * 60)
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPDrop.java
index a84d11e74c..dd85ed6b2d 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPDrop.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output;
import static gregtech.api.enums.Mods.GTPlusPlus;
import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
import java.util.List;
@@ -17,17 +17,17 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPDropType;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-public class GTPP_Drop extends Item {
+public class GTPPDrop extends Item {
@SideOnly(Side.CLIENT)
private IIcon secondIcon;
- public GTPP_Drop() {
+ public GTPPDrop() {
super();
this.setCreativeTab(Tabs.tabApiculture);
this.setHasSubtypes(true);
@@ -35,18 +35,18 @@ public class GTPP_Drop extends Item {
GameRegistry.registerItem(this, "gtpp.drop", GTPlusPlus.ID);
}
- public ItemStack getStackForType(GTPP_DropType type) {
+ public ItemStack getStackForType(GTPPDropType type) {
return new ItemStack(this, 1, type.mID);
}
- public ItemStack getStackForType(GTPP_DropType type, int count) {
+ public ItemStack getStackForType(GTPPDropType type, int count) {
return new ItemStack(this, count, type.mID);
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tabs, List list) {
- for (GTPP_DropType type : GTPP_DropType.values()) {
+ for (GTPPDropType type : GTPPDropType.values()) {
if (type.mShowInList) {
list.add(this.getStackForType(type));
}
@@ -79,11 +79,11 @@ public class GTPP_Drop extends Item {
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int pass) {
- int colour = GTPP_DropType.get(stack.getItemDamage())
+ int colour = GTPPDropType.get(stack.getItemDamage())
.getColours()[0];
if (pass >= 1) {
- colour = GTPP_DropType.get(stack.getItemDamage())
+ colour = GTPPDropType.get(stack.getItemDamage())
.getColours()[1];
}
@@ -92,7 +92,7 @@ public class GTPP_Drop extends Item {
@Override
public String getItemStackDisplayName(ItemStack stack) {
- return GTPP_DropType.get(stack.getItemDamage())
+ return GTPPDropType.get(stack.getItemDamage())
.getName();
}
@@ -102,7 +102,7 @@ public class GTPP_Drop extends Item {
public static void initDropsRecipes() {
ItemStack tDrop;
Logger.BEES("Processing recipes for " + GTPP_Bees.sDropMappings.size() + " Drops.");
- for (GTPP_DropType aDrop : GTPP_Bees.sDropMappings.values()) {
+ for (GTPPDropType aDrop : GTPP_Bees.sDropMappings.values()) {
tDrop = aDrop.getStackForType(1);
if (addProcess(
tDrop,
@@ -120,7 +120,7 @@ public class GTPP_Drop extends Item {
if (aOutput == null) {
return false;
}
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(tDrop)
.fluidOutputs(aOutput)
.duration(aDuration * TICKS)
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPollen.java
index 7e959151a0..9c07f294c5 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPollen.java
@@ -14,14 +14,14 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPPollenType;
-public class GTPP_Pollen extends Item {
+public class GTPPPollen extends Item {
@SideOnly(Side.CLIENT)
private IIcon secondIcon;
- public GTPP_Pollen() {
+ public GTPPPollen() {
super();
this.setCreativeTab(Tabs.tabApiculture);
this.setHasSubtypes(true);
@@ -29,18 +29,18 @@ public class GTPP_Pollen extends Item {
GameRegistry.registerItem(this, "gtpp.pollen", GTPlusPlus.ID);
}
- public ItemStack getStackForType(GTPP_PollenType type) {
+ public ItemStack getStackForType(GTPPPollenType type) {
return new ItemStack(this, 1, type.mID);
}
- public ItemStack getStackForType(GTPP_PollenType type, int count) {
+ public ItemStack getStackForType(GTPPPollenType type, int count) {
return new ItemStack(this, count, type.mID);
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tabs, List list) {
- for (GTPP_PollenType type : GTPP_PollenType.values()) {
+ for (GTPPPollenType type : GTPPPollenType.values()) {
if (type.mShowInList) {
list.add(this.getStackForType(type));
}
@@ -73,11 +73,11 @@ public class GTPP_Pollen extends Item {
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int pass) {
- int colour = GTPP_PollenType.get(stack.getItemDamage())
+ int colour = GTPPPollenType.get(stack.getItemDamage())
.getColours()[0];
if (pass >= 1) {
- colour = GTPP_PollenType.get(stack.getItemDamage())
+ colour = GTPPPollenType.get(stack.getItemDamage())
.getColours()[1];
}
@@ -86,7 +86,7 @@ public class GTPP_Pollen extends Item {
@Override
public String getItemStackDisplayName(ItemStack stack) {
- return GTPP_PollenType.get(stack.getItemDamage())
+ return GTPPPollenType.get(stack.getItemDamage())
.getName();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPropolis.java
index 1c1bd95d09..22d429a2e6 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPropolis.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output;
import static gregtech.api.enums.Mods.GTPlusPlus;
import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
import java.util.List;
@@ -16,17 +16,17 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPPropolisType;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-public class GTPP_Propolis extends Item {
+public class GTPPPropolis extends Item {
@SideOnly(Side.CLIENT)
private IIcon secondIcon;
- public GTPP_Propolis() {
+ public GTPPPropolis() {
super();
this.setCreativeTab(Tabs.tabApiculture);
this.setHasSubtypes(true);
@@ -34,18 +34,18 @@ public class GTPP_Propolis extends Item {
GameRegistry.registerItem(this, "gtpp.propolis", GTPlusPlus.ID);
}
- public ItemStack getStackForType(GTPP_PropolisType type) {
+ public ItemStack getStackForType(GTPPPropolisType type) {
return new ItemStack(this, 1, type.mID);
}
- public ItemStack getStackForType(GTPP_PropolisType type, int count) {
+ public ItemStack getStackForType(GTPPPropolisType type, int count) {
return new ItemStack(this, count, type.mID);
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tabs, List list) {
- for (GTPP_PropolisType type : GTPP_PropolisType.values()) {
+ for (GTPPPropolisType type : GTPPPropolisType.values()) {
if (type.mShowInList) {
list.add(this.getStackForType(type));
}
@@ -66,20 +66,20 @@ public class GTPP_Propolis extends Item {
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int pass) {
- return GTPP_PropolisType.get(stack.getItemDamage())
+ return GTPPPropolisType.get(stack.getItemDamage())
.getColours();
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
- return GTPP_PropolisType.get(stack.getItemDamage())
+ return GTPPPropolisType.get(stack.getItemDamage())
.getName();
}
public static void initPropolisRecipes() {
ItemStack tDrop;
Logger.BEES("Processing recipes for " + GTPP_Bees.sPropolisMappings.size() + " Propolis.");
- for (GTPP_PropolisType aProp : GTPP_Bees.sPropolisMappings.values()) {
+ for (GTPPPropolisType aProp : GTPP_Bees.sPropolisMappings.values()) {
tDrop = aProp.getStackForType(1);
if (addProcess(
tDrop,
@@ -98,7 +98,7 @@ public class GTPP_Propolis extends Item {
if (aOutput == null) {
return false;
}
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(tDrop)
.itemOutputs(aOutput)
.outputChances(aChance)
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FRGregTechRecipes.java
index ce982cd67e..eec1dfa0fc 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FRGregTechRecipes.java
@@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
+import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry;
-public class FR_Gregtech_Recipes {
+public class FRGregTechRecipes {
private static String rod_Electrum = "stickElectrum";
private static String rod_LongElectrum = "stickLongElectrum";
@@ -18,16 +18,16 @@ public class FR_Gregtech_Recipes {
private static String rod_Uranium = "stickUranium";
private static String rod_LongUranium = "stickLongUranium";
private static String foil_Uranium235 = "foilUranium235";
- private static ItemStack hiveFrameAccelerated = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameAccelerated);
- private static ItemStack hiveFrameMutagenic = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameMutagenic);
- private static ItemStack hiveFrameVoid = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameVoid);
- private static ItemStack hiveFrameBusy = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameBusy);
+ private static ItemStack hiveFrameAccelerated = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameAccelerated);
+ private static ItemStack hiveFrameMutagenic = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameMutagenic);
+ private static ItemStack hiveFrameVoid = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameVoid);
+ private static ItemStack hiveFrameBusy = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameBusy);
- private static ItemStack hiveFrameCocoa = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameCocoa);
- private static ItemStack hiveFrameCaged = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameCaged);
- private static ItemStack hiveFrameSoul = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameSoul);
- private static ItemStack hiveFrameClay = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameClay);
- private static ItemStack hiveFrameNova = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameNova);
+ private static ItemStack hiveFrameCocoa = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameCocoa);
+ private static ItemStack hiveFrameCaged = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameCaged);
+ private static ItemStack hiveFrameSoul = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameSoul);
+ private static ItemStack hiveFrameClay = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameClay);
+ private static ItemStack hiveFrameNova = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameNova);
private static ItemStack hiveFrameImpregnated = ItemUtils.getItemStackFromFQRN("Forestry:frameImpregnated", 1);
private static ItemStack blockSoulSand = new ItemStack(Blocks.soul_sand, 1);
@@ -35,10 +35,10 @@ public class FR_Gregtech_Recipes {
private static ItemStack itemClayDust = new ItemStack(Items.clay_ball, 1);
private static ItemStack itemCocoaBeans = new ItemStack(Items.dye, 1, 3);
- private static ItemStack hiveFrameDecay = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameDecay);
- private static ItemStack hiveFrameSlow = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameSlow);
- private static ItemStack hiveFrameStalilize = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameStalilize);
- private static ItemStack hiveFrameArborist = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameArborist);
+ private static ItemStack hiveFrameDecay = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameDecay);
+ private static ItemStack hiveFrameSlow = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameSlow);
+ private static ItemStack hiveFrameStalilize = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameStalilize);
+ private static ItemStack hiveFrameArborist = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameArborist);
public static void registerItems() {
// Magic Bee Like Frames
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_AlleleBeeSpecies.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPPAlleleBeeSpecies.java
index 05ce6e56e6..76524388e5 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_AlleleBeeSpecies.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPPAlleleBeeSpecies.java
@@ -9,9 +9,9 @@ import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IClassification;
import forestry.apiculture.genetics.alleles.AlleleBeeSpecies;
-public class GTPP_AlleleBeeSpecies extends AlleleBeeSpecies {
+public class GTPPAlleleBeeSpecies extends AlleleBeeSpecies {
- public GTPP_AlleleBeeSpecies(String uid, boolean dominant, String unlocalizedName, String authority,
+ public GTPPAlleleBeeSpecies(String uid, boolean dominant, String unlocalizedName, String authority,
String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor) {
super(
uid,
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPPBeeMutation.java
index d20b7ffb73..02e9ec0cbe 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPPBeeMutation.java
@@ -20,12 +20,11 @@ import forestry.api.genetics.IMutationCondition;
import forestry.apiculture.genetics.BeeMutation;
import forestry.core.genetics.mutations.Mutation;
-public class GTPP_Bee_Mutation extends BeeMutation {
+public class GTPPBeeMutation extends BeeMutation {
private final float split;
- public GTPP_Bee_Mutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance,
- float split) {
+ public GTPPBeeMutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance, float split) {
super(bee0, bee1, result, chance);
this.split = split;
BeeManager.beeRoot.registerMutation(this);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java
index 73418bdab8..11397e3ef3 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java
@@ -38,23 +38,24 @@ import forestry.core.genetics.alleles.AlleleHelper;
import forestry.core.genetics.alleles.EnumAllele.Lifespan;
import forestry.core.genetics.alleles.EnumAllele.Tolerance;
import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
import gregtech.common.items.CombType;
-import gregtech.loaders.misc.GT_Bees;
-import gtPlusPlus.core.material.ELEMENT.STANDALONE;
+import gregtech.loaders.misc.GTBeeDefinition;
+import gregtech.loaders.misc.GTBees;
import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialsElements.STANDALONE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPCombType;
public enum GTPP_BeeDefinition implements IBeeDefinition {
DRAGONBLOOD(GTPP_BranchDefinition.LEGENDARY, "Dragon Blood", STANDALONE.DRAGON_METAL, true,
Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20), beeSpecies -> {
- beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
- beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPP_CombType.DRAGONBLOOD), 0.10f);
+ beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
+ beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPPCombType.DRAGONBLOOD), 0.10f);
beeSpecies.setHumidity(ARID);
beeSpecies.setTemperature(EnumTemperature.NORMAL);
beeSpecies.setHasEffect();
@@ -67,13 +68,13 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
IBeeMutationCustom tMutation = dis.registerMutation("DRAGONESSENCE", "NEUTRONIUM", 2);
tMutation.restrictHumidity(ARID);
tMutation.requireResource(STANDALONE.DRAGON_METAL.getBlock(), 1);
- tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim
+ tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(1, "End")); // End Dim
}),
FORCE(GTPP_BranchDefinition.LEGENDARY, "Force", STANDALONE.FORCE, true, Utils.rgbtoHexValue(250, 250, 20),
Utils.rgbtoHexValue(200, 200, 5), beeSpecies -> {
- beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
- beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALT), 0.15f);
- beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPP_CombType.FORCE), 0.10f);
+ beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f);
+ beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SALT), 0.15f);
+ beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPPCombType.FORCE), 0.10f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.HOT);
beeSpecies.setHasEffect();
@@ -89,15 +90,15 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
}),;
private final GTPP_BranchDefinition branch;
- private final GTPP_AlleleBeeSpecies species;
- private final Consumer<GTPP_AlleleBeeSpecies> mSpeciesProperties;
+ private final GTPPAlleleBeeSpecies species;
+ private final Consumer<GTPPAlleleBeeSpecies> mSpeciesProperties;
private final Consumer<IAllele[]> mAlleles;
private final Consumer<GTPP_BeeDefinition> mMutations;
private IAllele[] template;
private IBeeGenome genome;
GTPP_BeeDefinition(GTPP_BranchDefinition branch, String binomial, Materials aMat, boolean dominant, int primary,
- int secondary, Consumer<GTPP_AlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles,
+ int secondary, Consumer<GTPPAlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles,
Consumer<GTPP_BeeDefinition> aMutations) {
this(
branch,
@@ -112,7 +113,7 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
}
GTPP_BeeDefinition(GTPP_BranchDefinition branch, String binomial, Material aMat, boolean dominant, int primary,
- int secondary, Consumer<GTPP_AlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles,
+ int secondary, Consumer<GTPPAlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles,
Consumer<GTPP_BeeDefinition> aMutations) {
this.mAlleles = aAlleles;
this.mMutations = aMutations;
@@ -123,13 +124,13 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
String uid = "gtpp.bee.species" + species;
String description = "for.description." + species;
String name = "for.bees.species." + lowercaseName;
- GT_LanguageManager.addStringLocalization("for.bees.species." + lowercaseName, species, true);
+ GTLanguageManager.addStringLocalization("for.bees.species." + lowercaseName, species, true);
GTPP_Bees.sMaterialMappings.put(
binomial.toLowerCase()
.replaceAll(" ", ""),
aMat);
this.branch = branch;
- this.species = new GTPP_AlleleBeeSpecies(
+ this.species = new GTPPAlleleBeeSpecies(
uid,
dominant,
name,
@@ -184,7 +185,7 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
return ret;
}
- private final void setSpeciesProperties(GTPP_AlleleBeeSpecies species2) {
+ private final void setSpeciesProperties(GTPPAlleleBeeSpecies species2) {
this.mSpeciesProperties.accept(species2);
}
@@ -239,7 +240,7 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
*/
private final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance,
float chancedivider) {
- return new GTPP_Bee_Mutation(parent1, parent2, this.getTemplate(), chance, chancedivider);
+ return new GTPPBeeMutation(parent1, parent2, this.getTemplate(), chance, chancedivider);
}
private final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance,
@@ -285,14 +286,12 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
return new BeeVariation.RainResist(this);
}
- private static final Class sGtBees = ReflectionUtils.getClass("gregtech.loaders.misc.GT_BeeDefinition");
-
public static IAlleleBeeSpecies getGregtechBeeType(String name) {
try {
- Enum aBeeObject = ReflectionUtils.getEnum(sGtBees, name);
- Field gtBeesField = ReflectionUtils.getField(sGtBees, "species");
- IAlleleBeeSpecies beeType = ReflectionUtils.getFieldValue(gtBeesField, aBeeObject);
- return beeType != null ? beeType : null;
+ // This is still cursed, but the species field is private and I don't want to go modify that right now
+ GTBeeDefinition aBeeObject = GTBeeDefinition.valueOf(name);
+ Field gtBeesField = ReflectionUtils.getField(GTBeeDefinition.class, "species");
+ return ReflectionUtils.getFieldValue(gtBeesField, aBeeObject);
} catch (Throwable t) {
t.printStackTrace();
return null;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
index 77b7d57954..bfdddcca8b 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
@@ -4,18 +4,18 @@ import static gregtech.api.enums.Mods.Forestry;
import java.util.HashMap;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType;
-import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Comb;
-import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Drop;
-import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Pollen;
-import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Propolis;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPCombType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPDropType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPPollenType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPPropolisType;
+import gtPlusPlus.xmod.forestry.bees.items.output.GTPPComb;
+import gtPlusPlus.xmod.forestry.bees.items.output.GTPPDrop;
+import gtPlusPlus.xmod.forestry.bees.items.output.GTPPPollen;
+import gtPlusPlus.xmod.forestry.bees.items.output.GTPPPropolis;
public class GTPP_Bees {
@@ -25,32 +25,32 @@ public class GTPP_Bees {
public static final byte MAGICBEES = 3;
public static final byte GREGTECH = 4;
- public static GTPP_Propolis propolis;
- public static GTPP_Pollen pollen;
- public static GTPP_Drop drop;
- public static GTPP_Comb combs;
+ public static GTPPPropolis propolis;
+ public static GTPPPollen pollen;
+ public static GTPPDrop drop;
+ public static GTPPComb combs;
public static HashMap<String, Material> sMaterialMappings = new HashMap<>();
- public static HashMap<Integer, GTPP_PropolisType> sPropolisMappings = new HashMap<>();
- public static HashMap<Integer, GTPP_PollenType> sPollenMappings = new HashMap<>();
- public static HashMap<Integer, GTPP_DropType> sDropMappings = new HashMap<>();
- public static HashMap<Integer, GTPP_CombType> sCombMappings = new HashMap<>();
+ public static HashMap<Integer, GTPPPropolisType> sPropolisMappings = new HashMap<>();
+ public static HashMap<Integer, GTPPPollenType> sPollenMappings = new HashMap<>();
+ public static HashMap<Integer, GTPPDropType> sDropMappings = new HashMap<>();
+ public static HashMap<Integer, GTPPCombType> sCombMappings = new HashMap<>();
public GTPP_Bees() {
- if (Forestry.isModLoaded() && GT_Mod.gregtechproxy.mGTBees) {
+ if (Forestry.isModLoaded() && GTMod.gregtechproxy.mGTBees) {
Logger.BEES("Creating required items.");
- propolis = new GTPP_Propolis();
- pollen = new GTPP_Pollen();
- drop = new GTPP_Drop();
- combs = new GTPP_Comb();
+ propolis = new GTPPPropolis();
+ pollen = new GTPPPollen();
+ drop = new GTPPDrop();
+ combs = new GTPPComb();
Logger.BEES("Loading types.");
initTypes();
Logger.BEES("Adding recipes.");
- GTPP_Drop.initDropsRecipes();
- GTPP_Propolis.initPropolisRecipes();
- GTPP_Comb.initCombsRecipes();
+ GTPPDrop.initDropsRecipes();
+ GTPPPropolis.initPropolisRecipes();
+ GTPPComb.initCombsRecipes();
Logger.BEES("Initialising bees.");
GTPP_BeeDefinition.initBees();
@@ -60,10 +60,11 @@ public class GTPP_Bees {
}
private static void initTypes() {
- ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.registry.GTPP_BeeDefinition");
- ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType");
- ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType");
- ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType");
- ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType");
+ // This is stupid
+ ReflectionUtils.loadClass(GTPP_BeeDefinition.class.getName());
+ ReflectionUtils.loadClass(GTPPCombType.class.getName());
+ ReflectionUtils.loadClass(GTPPDropType.class.getName());
+ ReflectionUtils.loadClass(GTPPPollenType.class.getName());
+ ReflectionUtils.loadClass(GTPPPropolisType.class.getName());
}
}