aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2017-12-13 18:11:06 +1000
committerJordan Byrne <draknyte1@hotmail.com>2017-12-13 18:11:06 +1000
commite2352057cb05af1d10984043bb2b6c723757558a (patch)
tree6f5a077bffe9fda3fef8b654d944f36f26a6666b /src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
parenta63504da17baf25d6296ed634667cd3cfd79634f (diff)
downloadGT5-Unofficial-e2352057cb05af1d10984043bb2b6c723757558a.tar.gz
GT5-Unofficial-e2352057cb05af1d10984043bb2b6c723757558a.tar.bz2
GT5-Unofficial-e2352057cb05af1d10984043bb2b6c723757558a.zip
+ Added more Kinds of bees.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java')
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java38
1 files changed, 23 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
index 6a28909a9f..8217fafdcb 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
@@ -6,14 +6,13 @@ import gtPlusPlus.core.util.Utils;
public enum CustomCombs {
//Custom Bees
-
+
//Rubbers & Silicons
SILICON("silicon", true, Materials.Silicon, 100),
RUBBER("rubber", true, Materials.Rubber, 100),
- PLASTIC("plastic", true, Materials.Plastic, 75),
- PTFE("ptfe", true, GTPP_Bees.PTFE, 50),
- PBS("pbs", true, GTPP_Bees.PBS, 25),
-
+ PLASTIC("polyethylene", true, Materials.Plastic, 75),
+ PTFE("polytetrafluoroethylene", true, GTPP_Bees.PTFE, 50),
+ PBS("styrene butadiene", true, GTPP_Bees.PBS, 25),
//Fuels
BIOMASS("biomass", true, Materials.Biomass, 100),
@@ -30,7 +29,11 @@ public enum CustomCombs {
FORCE("force", true, Materials.Force, 50),
NIKOLITE("nikolite", true, Materials.Nikolite, 75),
MITHRIL("mithril", true, Materials.Mithril, 10),
- ADAMANTIUM("adamantium", true, Materials.Adamantium, 5),
+ ADAMANTIUM("adamantium", true, Materials.Adamantium, 5),
+
+ //Trash
+ SALT("salt", true, Materials.Salt, 75),
+ SAND("sand", true, Materials.Sand, 100),
;
@@ -39,16 +42,21 @@ public enum CustomCombs {
{Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75)}, //RUBBER
{Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175)}, //PLASTIC
{Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75)}, //PTFE
- {Utils.rgbtoHexValue(232, 105, 0), Utils.rgbtoHexValue(183, 55, 0)}, //PBS
+ {Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)}, //PBS
//Unused
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)},
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)},
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)},
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)},
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)},
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)},
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)},
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)},
+ {Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14)}, //Biofuel
+ {Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32)}, //Ethanol
+ {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
+ {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
+ {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
+ {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
+ {Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150)}, // Fluorine
+ {Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5)}, // Force
+ {Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170)}, // Nikolite
+ {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
+ {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
+ {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
+ {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
{Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)},
{0x666666, 0x525252},
{0x2E8F5B, 0xDCC289},