aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/GT_Proxy.java
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-07-30 11:55:52 +0200
committerGitHub <noreply@github.com>2021-07-30 11:55:52 +0200
commitba89e885e41a463824c555e333754c9b48fcb145 (patch)
tree223d911fc87ee5c3f885ce7a7235e6e6a2f20d53 /src/main/java/gregtech/common/GT_Proxy.java
parent0f7a5c79f0941195d078b1877cd876b1d73b2b33 (diff)
parentae7fef8c66a633cfca503fee88353b857c44ad22 (diff)
downloadGT5-Unofficial-ba89e885e41a463824c555e333754c9b48fcb145.tar.gz
GT5-Unofficial-ba89e885e41a463824c555e333754c9b48fcb145.tar.bz2
GT5-Unofficial-ba89e885e41a463824c555e333754c9b48fcb145.zip
Merge pull request #609 from D-Cysteine/fix-clay-buckets
Oredict clay buckets + fix railcraft item IDs
Diffstat (limited to 'src/main/java/gregtech/common/GT_Proxy.java')
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 82dd4e3ba2..ec2781c82f 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -558,6 +558,14 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
GT_OreDictUnificator.registerOre("cropGrape", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 4));
GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem("ganyssurface", "teaLeaves", 1L, 0));
+ // Clay buckets, which don't get registered until Iguana Tweaks pre-init
+ OrePrefixes.bucketClay.mContainerItem = GT_ModHandler.getModItem("IguanaTweaksTConstruct", "clayBucketFired", 1L, 0);
+ GT_OreDictUnificator.set(OrePrefixes.bucketClay, Materials.Empty, GT_ModHandler.getModItem("IguanaTweaksTConstruct", "clayBucketFired", 1L, 0));
+ GT_OreDictUnificator.set(OrePrefixes.bucketClay, Materials.Water, GT_ModHandler.getModItem("IguanaTweaksTConstruct", "clayBucketWater", 1L, 0));
+ GT_OreDictUnificator.set(OrePrefixes.bucketClay, Materials.Lava, GT_ModHandler.getModItem("IguanaTweaksTConstruct", "clayBucketLava", 1L, 0));
+ GT_OreDictUnificator.set(OrePrefixes.bucketClay, Materials.Milk, GT_ModHandler.getModItem("IguanaTweaksTConstruct", "clayBucketMilk", 1L, 0));
+ FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData(Materials.Milk.getFluid(1000L), GT_OreDictUnificator.get(OrePrefixes.bucketClay, Materials.Milk, 1L), GT_OreDictUnificator.get(OrePrefixes.bucketClay, Materials.Empty, 1L)));
+
// IC2 Hazmat
addFullHazmatToIC2Item("hazmatHelmet");
addFullHazmatToIC2Item("hazmatChestplate");