aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-09-15 22:28:46 +0200
committerDream-Master <dream-master@gmx.net>2018-09-15 22:28:46 +0200
commitd579f80825adb305fef031f4950a44087838eb0c (patch)
tree468cbe9781ebb9a1e9d014434d8f69f1ea8f1892 /src
parent543f12ecc948a3824766751846f8571c33c44abb (diff)
downloadGT5-Unofficial-d579f80825adb305fef031f4950a44087838eb0c.tar.gz
GT5-Unofficial-d579f80825adb305fef031f4950a44087838eb0c.tar.bz2
GT5-Unofficial-d579f80825adb305fef031f4950a44087838eb0c.zip
try to fix fluids as muation blocks and show now dim and biome
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java6
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Bees.java4
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index bcc02ca1e4..237b3b85cf 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -19,6 +19,8 @@ import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.util.GT_ModHandler;
import gregtech.common.items.CombType;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.BiomeDictionary;
@@ -248,7 +250,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
@Override
protected void registerMutations() {
IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Icy"), getSpecies(FORRESTRY,"Glacial"), 10);
- tMutation.requireResource(FluidRegistry.getFluid("ic2coolant").getBlock(), 0);
+ tMutation.requireResource(Block.getBlockFromItem(GT_ModHandler.getModItem("IC2", "fluidCoolant", 1).getItem()), 0);
tMutation.restrictTemperature(EnumTemperature.ICY);
}
},
@@ -276,7 +278,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
@Override
protected void registerMutations() {
IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Demonic"), getSpecies(EXTRABEES,"volcanic"), 10);
- tMutation.requireResource(FluidRegistry.getFluid("ic2hotcoolant").getBlock(), 0);
+ tMutation.requireResource(Block.getBlockFromItem(GT_ModHandler.getModItem("IC2", "fluidHotCoolant", 1).getItem()), 0);
tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(128));//Boneyard Biome
}
},
diff --git a/src/main/java/gregtech/loaders/misc/GT_Bees.java b/src/main/java/gregtech/loaders/misc/GT_Bees.java
index bf564daaf0..b4f49e8dca 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Bees.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Bees.java
@@ -142,7 +142,7 @@ public class GT_Bees {
@Override
public String getDescription() {
- return StringUtil.localizeAndFormat("mutation.condition.dim", dimName);
+ return StringUtil.localizeAndFormat("mutation.condition.dim") + dimName;
}
}
@@ -165,7 +165,7 @@ public class GT_Bees {
public String getDescription() {
if (BiomeGenBase.getBiome(biomeID)!=null) {
String biomeName = BiomeGenBase.getBiome(biomeID).biomeName.toLowerCase(Locale.ENGLISH);
- return StringUtil.localizeAndFormat("mutation.condition.biomeid", biomeName);
+ return StringUtil.localizeAndFormat("mutation.condition.biomeid") + biomeName;
}
return "";
}