Skip to content
This repository was archived by the owner on May 26, 2024. It is now read-only.

Commit 0af6401

Browse files
draknyte1draknyte1
committed
Bee basework.
1 parent 888f07c commit 0af6401

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1753
-5
lines changed

‎src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
import java.lang.reflect.Method;
55

66
import cpw.mods.fml.common.Optional;
7-
8-
import net.minecraft.block.Block;
9-
import net.minecraft.world.World;
10-
117
import gtPlusPlus.core.lib.LoadedMods;
128
import gtPlusPlus.core.util.reflect.ReflectionUtils;
139
import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
1410
import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
11+
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
12+
import net.minecraft.block.Block;
13+
import net.minecraft.world.World;
1514

1615
public class HANDLER_FR {
1716

@@ -23,7 +22,7 @@ public static void preInit(){
2322

2423
public static void Init(){
2524
if (LoadedMods.Forestry){
26-
//new GTPP_Bees(); TODO- Will Investigate this properly later.
25+
new GTPP_Bees();
2726
}
2827
}
2928

‎src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java

+194
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
package gtPlusPlus.xmod.forestry.bees.handler;
2+
3+
import gregtech.api.enums.Materials;
4+
import gregtech.api.util.GT_LanguageManager;
5+
6+
public enum GTPP_CombType {
7+
//Organic Line
8+
LIGNIE("lignite", true, Materials.Lignite, 100,0x58300B, 0x906237),
9+
COAL("coal", true, Materials.Coal, 100,0x525252, 0x666666),
10+
STICKY("stickyresin", true, Materials._NULL, 50,0x2E8F5B, 0xDCC289),
11+
OIL("oil", true, Materials._NULL, 100,0x333333, 0x4C4C4C),
12+
APATITE("apatite", true, Materials.Apatite, 100,0xc1c1f6, 0x676784),
13+
ASH("ash", true, Materials.Ash, 100,0x1e1a18, 0xc6c6c6),
14+
15+
//IC2 Line
16+
COOLANT("coolant", true, Materials._NULL, 100,0x144F5A, 0x2494A2),
17+
ENERGY("energy", true, Materials._NULL, 80,0xC11F1F, 0xEBB9B9),
18+
LAPOTRON("lapotron", true, Materials._NULL, 60,0x1414FF, 0x6478FF),
19+
PYROTHEUM("pyrotheum", true, Materials.Pyrotheum, 50,0xffebc4, 0xe36400),
20+
CRYOTHEUM("cryotheum", true, Materials.Pyrotheum, 50,0x2660ff, 0x5af7ff),
21+
22+
//Alloy Line
23+
REDALLOY("redalloy", true, Materials.RedAlloy, 100,0xE60000, 0xB80000),
24+
REDSTONEALLOY("redstonealloy", true, Materials.RedstoneAlloy, 90,0xB80000, 0xA50808),
25+
CONDUCTIVEIRON("conductiveiron", true, Materials.ConductiveIron, 80,0x817671, 0xCEADA3),
26+
VIBRANTALLOY("vibrantalloy", true, Materials.VibrantAlloy, 50,0x86A12D, 0xC4F2AE),
27+
ENERGETICALLOY("energeticalloy", true, Materials.EnergeticAlloy, 70,0xFF9933, 0xFFAD5C),
28+
ELECTRICALSTEEL("electricalsteel", true, Materials.ElectricalSteel, 90,0x787878, 0xD8D8D8),
29+
DARKSTEEL("darksteel", true, Materials.DarkSteel, 80,0x252525, 0x443B44),
30+
PULSATINGIRON("pulsatingiron", true, Materials.PulsatingIron, 80,0x006600, 0x6DD284),
31+
STAINLESSSTEEL("stainlesssteel", true, Materials.StainlessSteel, 75,0x778899, 0xC8C8DC),
32+
ENDERIUM("enderium", true, Materials.Enderium, 40,0x2E8B57, 0x599087),
33+
34+
//Thaumcraft Line
35+
THAUMIUMDUST("thaumiumdust", true, Materials.Thaumium, 100,0x7A007A, 0x5C005C),
36+
THAUMIUMSHARD("thaumiumshard", true, Materials._NULL, 85,0x9966FF, 0xAD85FF),
37+
AMBER("amber", true, Materials.Amber, 90,0x774B15, 0xEE7700),
38+
QUICKSILVER("quicksilver", true, Materials.Mercury, 90,0xc7c7ea, 0xb5b3df),
39+
SALISMUNDUS("salismundus", true, Materials._NULL, 75,0xF7ADDE, 0x592582),
40+
TAINTED("tainted", true, Materials._NULL, 80,0x904BB8, 0xE800FF),
41+
MITHRIL("mithril", true, Materials.Mithril, 70,0xF0E68C, 0xFFFFD2),
42+
ASTRALSILVER("astralsilver", true, Materials.AstralSilver, 70,0xAFEEEE, 0xE6E6FF),
43+
THAUMINITE("thauminite", true, Materials._NULL, 50,0x2E2D79, 0x7581E0),
44+
SHADOWMETAL("shadowmetal", true, Materials.Shadow, 50,0x100322, 0x100342),
45+
DIVIDED("divided", true, Materials.Unstable, 40,0xF0F0F0, 0xDCDCDC),
46+
SPARKELING("sparkling", true, Materials.NetherStar, 40,0x7A007A, 0xFFFFFF),
47+
48+
//Gem Line
49+
STONE("stone", true, Materials._NULL, 70,0x808080, 0x999999),
50+
CERTUS("certus", true, Materials.CertusQuartz, 100,0x57CFFB, 0xBBEEFF),
51+
FLUIX("fluix", true, Materials.Fluix, 100,0xA375FF, 0xB591FF),
52+
REDSTONE("redstone", true, Materials.Redstone, 100,0x7D0F0F, 0xD11919),
53+
RAREEARTH("rareearth", true, Materials.RareEarth, 100,0x555643, 0x343428),
54+
LAPIS("lapis", true, Materials.Lapis, 100,0x1947D1, 0x476CDA),
55+
RUBY("ruby", true, Materials.Ruby, 100,0xE6005C, 0xCC0052),
56+
REDGARNET("redgarnet", true, Materials.GarnetRed,100,0xBD4C4C, 0xECCECE),
57+
YELLOWGARNET("yellowgarnet", true, Materials.GarnetYellow,100,0xA3A341, 0xEDEDCE),
58+
SAPPHIRE("sapphire", true, Materials.Sapphire, 100,0x0033CC, 0x00248F),
59+
DIAMOND("diamond", true, Materials.Diamond, 100,0xCCFFFF, 0xA3CCCC),
60+
OLIVINE("olivine", true, Materials.Olivine, 100,0x248F24, 0xCCFFCC),
61+
EMERALD("emerald", true, Materials.Emerald, 100,0x248F24, 0x2EB82E),
62+
PYROPE("pyrope", true, Materials.Pyrope, 100,0x763162, 0x8B8B8B),
63+
GROSSULAR("grossular", true, Materials.Grossular, 100,0x9B4E00, 0x8B8B8B),
64+
FIRESTONE("firestone", true, Materials.Firestone, 100,0xC00000, 0xFF0000),
65+
66+
//Metals Line
67+
SLAG("slag", true, Materials._NULL, 50,0xD4D4D4, 0x58300B),
68+
COPPER("copper", true, Materials.Copper, 100,0xFF6600, 0xE65C00),
69+
TIN("tin", true, Materials.Tin, 100,0xD4D4D4, 0xDDDDDD),
70+
LEAD("lead", true, Materials.Lead, 100,0x666699, 0xA3A3CC),
71+
IRON("iron", true, Materials.Iron, 100,0xDA9147, 0xDE9C59),
72+
STEEL("steel", true, Materials.Steel, 95,0x808080, 0x999999),
73+
NICKEL("nickel", true, Materials.Nickel, 100,0x8585AD, 0x9D9DBD),
74+
ZINC("zinc", true, Materials.Zinc, 100,0xF0DEF0, 0xF2E1F2),
75+
SILVER("silver", true, Materials.Silver, 100,0xC2C2D6, 0xCECEDE),
76+
GOLD("gold", true, Materials.Gold, 100,0xE6B800, 0xCFA600),
77+
SULFUR("sulfur", true, Materials.Sulfur, 100,0x6F6F01, 0x8B8B8B),
78+
GALLIUM ("gallium", true, Materials.Gallium, 75,0x8B8B8B, 0xC5C5E4),
79+
ARSENIC ("arsenic", true, Materials.Arsenic, 75,0x736C52, 0x292412),
80+
81+
//Rare Metals Line
82+
BAUXITE("bauxite", true, Materials.Bauxite, 85,0x6B3600, 0x8B8B8B),
83+
ALUMINIUM("aluminium", true, Materials.Aluminium, 60,0x008AB8, 0xD6D6FF),
84+
MANGANESE("manganese", true, Materials.Manganese, 30,0xD5D5D5, 0xAAAAAA),
85+
MAGNESIUM("magnesium", true, Materials.Magnesium, 75,0xF1D9D9, 0x8B8B8B),
86+
TITANIUM("titanium", true, Materials.Ilmenite, 100,0xCC99FF, 0xDBB8FF),
87+
CHROME("chromium", true, Materials.Chrome, 50,0xEBA1EB, 0xF2C3F2),
88+
TUNGSTEN("tungsten", true, Materials.Tungstate, 100,0x62626D, 0x161620),
89+
PLATINUM("platinum", true, Materials.Platinum, 40,0xE6E6E6, 0xFFFFCC),
90+
IRIDIUM("iridium", true, Materials.Iridium, 20,0xDADADA, 0xD1D1E0),
91+
MOLYBDENUM("molybdenum", true, Materials.Molybdenum, 20,0xAEAED4, 0x8B8B8B),
92+
OSMIUM("osmium", true, Materials.Osmium, 15,0x2B2BDA, 0x8B8B8B),
93+
LITHIUM("lithium", true, Materials.Lithium, 75,0xF0328C, 0xE1DCFF),
94+
SALT("salt", true, Materials.Salt, 90,0xF0C8C8, 0xFAFAFA),
95+
ELECTROTINE("electrotine", true, Materials.Electrotine, 75,0x1E90FF, 0x3CB4C8),
96+
ALMANDINE("almandine", true, Materials.Almandine, 85,0xC60000, 0x8B8B8B),
97+
98+
//Radioactive Line
99+
URANIUM("uranium", true, Materials.Uranium, 50,0x19AF19, 0x169E16),
100+
PLUTONIUM("plutonium", true, Materials.Plutonium, 10,0x240000, 0x570000),
101+
NAQUADAH("naquadah", true, Materials.Naquadah, 10,0x000000, 0x004400),
102+
NAQUADRIA("naquadria", true, Materials.Naquadria, 5,0x000000, 0x002400),
103+
DOB("d-o-b", true, Materials._NULL, 50,0x007700, 0x002400),
104+
THORIUM("thorium", true, Materials.Thorium, 75,0x001E00, 0x005000),
105+
LUTETIUM("lutetium", true, Materials.Lutetium, 10,0xE6FFE6, 0xFFFFFF),
106+
AMERICIUM("americium", true, Materials.Americium, 5,0xE6E6FF, 0xC8C8C8),
107+
NEUTRONIUM("neutronium", true, Materials.Neutronium, 2,0xFFF0F0, 0xFAFAFA),
108+
109+
//Twilight
110+
NAGA("naga", true, Materials._NULL, 100,0x0D5A0D, 0x28874B),
111+
LICH("lich", true, Materials._NULL, 90,0x5C605E, 0xC5C5C5),
112+
HYDRA("hydra", true, Materials._NULL, 80,0x872836, 0xB8132C),
113+
URGHAST("urghast", true, Materials._NULL, 70,0x7C0618, 0xA7041C),
114+
SNOWQUEEN("snowqueen", true, Materials._NULL, 60,0x9C0018, 0xD02001),
115+
116+
//Space
117+
SPACE("space", true, Materials._NULL, 100,0x003366, 0xC0C0C0),
118+
METEORICIRON("meteoriciron",true, Materials.MeteoricIron, 100,0x321928, 0x643250),
119+
DESH("desh",true, Materials.Desh, 90,0x282828, 0x323232),
120+
LEDOX("ledox",true, Materials.Ledox, 75,0x0000CD, 0x0074FF),
121+
CALLISTOICE("callistoice",true, Materials.CallistoIce, 75,0x0074FF, 0x1EB1FF),
122+
MYTRYL("mytryl",true, Materials.Mytryl, 65,0xDAA520, 0xF26404),
123+
QUANTIUM("quantium",true, Materials.Quantium, 50,0x00FF00, 0x00D10B),
124+
ORIHARUKON("oriharukon",true, Materials.Oriharukon, 50,0x228B22, 0x677D68),
125+
MYSTERIOUSCRYSTAL("mysteriouscrystal",true, Materials.MysteriousCrystal, 45,0x3CB371, 0x16856C),
126+
BLACKPLUTONIUM("blackplutonium",true, Materials.Quantium, 25,0x000000, 0x323232),
127+
TRINIUM("trinium",true, Materials.Trinium, 25,0xB0E0E6, 0xC8C8D2),
128+
129+
//Planet
130+
MERCURY("mercury", true, Materials._NULL, 65,0x4A4033, 0xB5A288),
131+
VENUS("venus",true, Materials._NULL, 65,0x120E07, 0x272010),
132+
MOON("moon",true, Materials._NULL, 90,0x373735, 0x7E7E78),
133+
MARS("mars",true, Materials._NULL, 80,0x220D05, 0x3A1505),
134+
JUPITER("jupiter",true, Materials._NULL, 75,0x734B2E, 0xD0CBC4),
135+
SATURN("saturn",true, Materials._NULL, 55,0xD2A472, 0xF8C37B),
136+
URANUS("uranus",true, Materials._NULL, 45,0x75C0C9, 0x84D8EC),
137+
NEPTUN("neptun",true, Materials._NULL, 35,0x334CFF, 0x576DFF),
138+
PLUTO("pluto",true, Materials._NULL, 25,0x34271E, 0x69503D),
139+
HAUMEA("haumea",true, Materials._NULL, 20,0x1C1413, 0x392B28),
140+
MAKEMAKE("makemake",true, Materials._NULL, 20,0x301811, 0x120A07),
141+
CENTAURI("centauri",true, Materials._NULL, 15,0x2F2A14, 0xB06B32),
142+
TCETI("tceti",true, Materials._NULL, 10,0x46241A, 0x7B412F),
143+
BARNARDA("barnarda",true, Materials._NULL, 10,0x0D5A0D, 0xE6C18D),
144+
VEGA("vega",true, Materials._NULL, 10,0x1A2036, 0xB5C0DE),
145+
146+
//Infinity
147+
COSMICNEUTRONIUM("cosmicneutronium",true, Materials._NULL, 5,0x484848, 0x323232),
148+
INFINITYCATALYST("infinitycatalyst",true, Materials._NULL, 2,0xFFFFFF, 0xFFFFFF),
149+
INFINITY("infinity",true, Materials._NULL, 1,0xFFFFFF, 0xFFFFFF),
150+
151+
//HEE
152+
ENDDUST("enddust", true, Materials._NULL, 50,0x003A7D, 0xCC00FA),
153+
ECTOPLASMA("ectoplasma", true, Materials._NULL, 35,0x381C40, 0xDCB0E5),
154+
ARCANESHARD("arcaneshard", true, Materials._NULL, 35,0x333D82, 0x9010AD),
155+
STARDUST("stardust", true, Materials._NULL, 60,0xDCBE13, 0xffff00),
156+
DRAGONESSENCE("dragonessence", true, Materials._NULL, 30,0x911ECE, 0xFFA12B),
157+
ENDERMAN("enderman", true, Materials._NULL, 25,0x6200e7, 0x161616),
158+
SILVERFISH("silverfish", true, Materials._NULL, 25,0x0000000, 0xEE053D),
159+
ENDIUM("endium", true, Materials.HeeEndium, 50,0x2F5A6C, 0xa0ffff),
160+
RUNEI("rune1", true, Materials._NULL, 10,0x0104D9, 0xE31010),
161+
RUNEII("rune2", true, Materials._NULL, 10,0xE31010, 0x0104D9),
162+
FIREESSENSE("fireessence", true, Materials._NULL, 30,0xFFA157, 0xD41238),
163+
164+
//New Combs to avoid meta id issues
165+
CRYOLITE("cryolite", true, Materials.Cryolite, 90, 0xBFEFFF, 0x73B9D0);
166+
167+
public boolean showInList;
168+
public Materials material;
169+
public int chance;
170+
171+
private String name;
172+
private int[] color;
173+
174+
GTPP_CombType(String pName, boolean show, Materials material, int chance, int... color) {
175+
this.name = pName;
176+
this.material = material;
177+
this.chance = chance;
178+
this.showInList = show;
179+
this.color=color;
180+
}
181+
182+
public void setHidden() {
183+
this.showInList = false;
184+
}
185+
186+
public String getName() {
187+
188+
return GT_LanguageManager.addStringLocalization("comb." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb");
189+
}
190+
191+
public int[] getColours() {
192+
return color == null || color.length != 2 ? new int[]{0,0} : color;
193+
}
194+
}

‎src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package gtPlusPlus.xmod.forestry.bees.handler;
2+
3+
import gregtech.api.enums.Materials;
4+
import gregtech.api.util.GT_LanguageManager;
5+
6+
public enum GTPP_DropType {
7+
8+
OIL("oil",true),
9+
MUTAGEN("small mutagen catalyst",true),
10+
COOLANT("coolant",true),
11+
HOT_COOLANT("hot coolant",true),
12+
HYDRA("hydra blood",true),
13+
SNOW_QUEEN("snowqueen blood",true),
14+
OXYGEN("oxygen",true),
15+
LAPIS("lapis coolant",true),
16+
ENDERGOO("ender goo",true);
17+
18+
private static int[][] colours = new int[][]{
19+
{0x19191B, 0x303032},
20+
{0xffc100, 0x00ff11},
21+
{0x144F5A, 0x2494A2},
22+
{0xC11F1F, 0xEBB9B9},
23+
{0x872836, 0xB8132C},
24+
{0xD02001, 0x9C0018},
25+
{0x003366, 0x0066BB},
26+
{0x1727b1, 0x008ce3},
27+
{0xA005E7, 0x161616},
28+
};
29+
public boolean showInList;
30+
public Materials material;
31+
public int chance;
32+
private String name;
33+
34+
private GTPP_DropType(String pName, boolean show) {
35+
this.name = pName;
36+
this.showInList = show;
37+
}
38+
39+
public void setHidden() {
40+
this.showInList = false;
41+
}
42+
43+
public String getName() {
44+
45+
return GT_LanguageManager.addStringLocalization("drop." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Drop");
46+
}
47+
48+
public int[] getColours() {
49+
return colours[this.ordinal()];
50+
}
51+
}

‎src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package gtPlusPlus.xmod.forestry.bees.handler;
2+
3+
import gregtech.api.enums.Materials;
4+
import gregtech.api.util.GT_LanguageManager;
5+
6+
public enum GTPP_PollenType {
7+
8+
MATRIX("matrix",true);
9+
10+
private static int[][] colours = new int[][]{
11+
{0x19191B, 0x303032},
12+
};
13+
public boolean showInList;
14+
public Materials material;
15+
public int chance;
16+
private String name;
17+
18+
private GTPP_PollenType(String pName, boolean show) {
19+
this.name = pName;
20+
this.showInList = show;
21+
}
22+
23+
public void setHidden() {
24+
this.showInList = false;
25+
}
26+
27+
public String getName() {
28+
return GT_LanguageManager.addStringLocalization("pollen." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Pollen");
29+
}
30+
31+
public int[] getColours() {
32+
return colours[this.ordinal()];
33+
}
34+
}

‎src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package gtPlusPlus.xmod.forestry.bees.handler;
2+
3+
import gregtech.api.enums.Materials;
4+
import gregtech.api.util.GT_LanguageManager;
5+
6+
public enum GTPP_PropolisType {
7+
8+
End("End",true),
9+
Ectoplasma("Ectoplasma",true),
10+
Arcaneshard("Arcaneshard",true),
11+
Stardust("Stardust",true),
12+
Dragonessence("Dragonessence",true),
13+
Enderman("Enderman",true),
14+
Silverfish("Silverfish", true),
15+
Endium("Endium", true),
16+
Fireessence("Fireessence",true);
17+
18+
private static int[] colours = new int[]{
19+
0xCC00FA,
20+
0xDCB0E5,
21+
0x9010AD,
22+
0xFFFF00,
23+
0x911ECE,
24+
0x161616,
25+
0xEE053D,
26+
0xa0ffff,
27+
0xD41238
28+
};
29+
30+
public boolean showInList;
31+
public Materials material;
32+
public int chance;
33+
private String name;
34+
35+
private GTPP_PropolisType(String pName, boolean show) {
36+
this.name = pName;
37+
this.showInList = show;
38+
}
39+
40+
public void setHidden() {
41+
this.showInList = false;
42+
}
43+
44+
public String getName() {
45+
// return "gt.comb."+this.name;
46+
return GT_LanguageManager.addStringLocalization("propolis." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Propolis");
47+
}
48+
49+
public int getColours() {
50+
return colours[this.ordinal()];
51+
}
52+
}

0 commit comments

Comments
 (0)