aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/misc
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-09-08 21:49:30 +0200
committerDream-Master <dream-master@gmx.net>2018-09-08 21:49:30 +0200
commit08294f7f52a41415bedcbea9d9ea3947a43d3e94 (patch)
tree3b0c0ffd97bf8f3def555794c92933d267d551a8 /src/main/java/gregtech/loaders/misc
parentc4ee5701ea4855e337d3a6cdcd60378123afe22d (diff)
downloadGT5-Unofficial-08294f7f52a41415bedcbea9d9ea3947a43d3e94.tar.gz
GT5-Unofficial-08294f7f52a41415bedcbea9d9ea3947a43d3e94.tar.bz2
GT5-Unofficial-08294f7f52a41415bedcbea9d9ea3947a43d3e94.zip
test zokos patch
Diffstat (limited to 'src/main/java/gregtech/loaders/misc')
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index bdc4ed8e5e..4f7ddf8344 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -798,9 +798,22 @@ public enum GT_BeeDefinition implements IBeeDefinition {
}
private static IAlleleBeeSpecies getSpecies(String name) {
- return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele((new StringBuilder()).append("forestry.species").append(name).toString());
+ return getSpecies("forestry", name);
}
+ private static IAlleleBeeSpecies getSpecies(String modid, String name) {
+ String s;
+ switch(modid) {
+ case "extrabees": s = new StringBuilder().append("extrabees.species.").append(name).toString();break;
+ case "gendustry": s = new StringBuilder().append("gendustry.bee.").append(name).toString();break;
+ case "magicbees": s = new StringBuilder().append("magicbees.species").append(name).toString();break;
+ case "forestry":
+ default: s = new StringBuilder().append("forestry.species").append(name).toString();break;
+
+ }
+ return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele(s);
+ }
+
protected abstract void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies);
protected abstract void setAlleles(IAllele[] template);