Merge remote-tracking branch 'origin/pr/3036' into 1.10.x Closes #3036 Thanks Mezz!

This commit is contained in:
cpw committed 2016-07-12 18:05:13 -04:00
commit 565cfb155f
3 files changed
+129 -2

No files matched your search

@@ -54,9 +54,14 @@ public class DynBucketTest
private static final ResourceLocation simpleTankName = new ResourceLocation(MODID, "simpletank");
private static final ResourceLocation testItemName = new ResourceLocation(MODID, "testitem");
private static final boolean ENABLE = false;
static
{
FluidRegistry.enableUniversalBucket();
if (ENABLE)
{
FluidRegistry.enableUniversalBucket();
}
}
@SidedProxy
@@ -78,6 +83,9 @@ public class DynBucketTest
@Override
void setupModels()
{
if (!ENABLE)
return;
ModelLoader.setBucketModelDefinition(dynBucket);
final ModelResourceLocation bottle = new ModelResourceLocation(new ResourceLocation("forge", "dynbottle"), "inventory");
@@ -99,6 +107,9 @@ public class DynBucketTest
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
if (!ENABLE)
return;
GameRegistry.register(new TestItem(), testItemName);
Block tank = new BlockSimpleTank();
GameRegistry.register(tank, simpleTankName);
@@ -27,13 +27,21 @@ public class ModelFluidDebug
public static final String MODID = "ForgeDebugModelFluid";
public static final String VERSION = "1.0";
public static final boolean ENABLE = false;
@SidedProxy
public static CommonProxy proxy;
public static final Fluid milkFluid = new Fluid("milk", new ResourceLocation("forge", "blocks/milk_still"), new ResourceLocation("forge", "blocks/milk_flow"));
@EventHandler
public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); }
public void preInit(FMLPreInitializationEvent event)
{
if (ENABLE)
{
proxy.preInit(event);
}
}
public static class CommonProxy
{