From 2e28985b8dbb77e14a8d63875857fda8b2d0f0ed Mon Sep 17 00:00:00 2001 From: defeatedcrow Date: Wed, 18 Apr 2018 22:23:23 +0900 Subject: [PATCH] =?UTF-8?q?-=20fix:=20=E3=81=84=E3=81=8F=E3=81=A4=E3=81=8B?= =?UTF-8?q?=E3=81=AE=E3=83=86=E3=82=AF=E3=82=B9=E3=83=81=E3=83=A3=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E3=83=9F=E3=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- java/defeatedcrow/hac/food/item/CakeItem.java | 2 +- java/defeatedcrow/hac/food/item/ItemFluidPack.java | 2 +- java/defeatedcrow/hac/main/ClimateMain.java | 2 +- .../dcs_climate/blockstates/dcs_fluidblock_mazai.json | 9 +++++++++ .../dcs_climate/models/item/dcs_fluidblock_mazai.json | 1 + .../dcs_climate/models/item/food/dcs_food_cake8.json | 2 +- .../dcs_climate/models/item/food/dcs_food_cake9.json | 2 +- resources/mcmod.info | 2 +- 8 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 resources/assets/dcs_climate/blockstates/dcs_fluidblock_mazai.json create mode 100644 resources/assets/dcs_climate/models/item/dcs_fluidblock_mazai.json diff --git a/java/defeatedcrow/hac/food/item/CakeItem.java b/java/defeatedcrow/hac/food/item/CakeItem.java index b884c3e7f..4ad1d2ac7 100644 --- a/java/defeatedcrow/hac/food/item/CakeItem.java +++ b/java/defeatedcrow/hac/food/item/CakeItem.java @@ -31,7 +31,7 @@ public CakeItem(boolean isWolfFood) { @Override public int getMaxMeta() { - return 5; + return 9; } @Override diff --git a/java/defeatedcrow/hac/food/item/ItemFluidPack.java b/java/defeatedcrow/hac/food/item/ItemFluidPack.java index 5f0a78a89..dd8cd17ba 100644 --- a/java/defeatedcrow/hac/food/item/ItemFluidPack.java +++ b/java/defeatedcrow/hac/food/item/ItemFluidPack.java @@ -176,7 +176,7 @@ public static int getMetaFromFluid(Fluid fluid) { int meta = 0; if (fluid == FluidRegistry.WATER) { meta = 1; - } else if (fluid.getName().contains("milk")) { + } else if (fluid.getName().equalsIgnoreCase("milk")) { meta = 2; } else if (fluid == FoodInit.cream) { meta = 3; diff --git a/java/defeatedcrow/hac/main/ClimateMain.java b/java/defeatedcrow/hac/main/ClimateMain.java index b0c9fbe82..270cd8205 100644 --- a/java/defeatedcrow/hac/main/ClimateMain.java +++ b/java/defeatedcrow/hac/main/ClimateMain.java @@ -39,7 +39,7 @@ public class ClimateMain { public static final String MOD_NAME = "HeatAndClimateMod"; public static final int MOD_MEJOR = 2; public static final int MOD_MINOR = 3; - public static final int MOD_BUILD = 7; + public static final int MOD_BUILD = 8; public static final String MOD_DEPENDENCIES = "required-after:dcs_lib@[2.3.1,)"; @SidedProxy(clientSide = "defeatedcrow.hac.main.client.ClientMainProxy", serverSide = "defeatedcrow.hac.main.CommonMainProxy") diff --git a/resources/assets/dcs_climate/blockstates/dcs_fluidblock_mazai.json b/resources/assets/dcs_climate/blockstates/dcs_fluidblock_mazai.json new file mode 100644 index 000000000..872208d72 --- /dev/null +++ b/resources/assets/dcs_climate/blockstates/dcs_fluidblock_mazai.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "fluid": { + "model" : "forge:fluid", + "custom": { "fluid": "dcs.mazai" } + } + } +} \ No newline at end of file diff --git a/resources/assets/dcs_climate/models/item/dcs_fluidblock_mazai.json b/resources/assets/dcs_climate/models/item/dcs_fluidblock_mazai.json new file mode 100644 index 000000000..a2e33c6e3 --- /dev/null +++ b/resources/assets/dcs_climate/models/item/dcs_fluidblock_mazai.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"dcs_climate:blocks/fluid/mazai_still"}} diff --git a/resources/assets/dcs_climate/models/item/food/dcs_food_cake8.json b/resources/assets/dcs_climate/models/item/food/dcs_food_cake8.json index 96795a97f..d0a01cf8b 100644 --- a/resources/assets/dcs_climate/models/item/food/dcs_food_cake8.json +++ b/resources/assets/dcs_climate/models/item/food/dcs_food_cake8.json @@ -1 +1 @@ -{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/cake_egg_cocotte_raw"}} +{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/egg_cocotte_raw"}} diff --git a/resources/assets/dcs_climate/models/item/food/dcs_food_cake9.json b/resources/assets/dcs_climate/models/item/food/dcs_food_cake9.json index 9eea3969f..7250b9668 100644 --- a/resources/assets/dcs_climate/models/item/food/dcs_food_cake9.json +++ b/resources/assets/dcs_climate/models/item/food/dcs_food_cake9.json @@ -1 +1 @@ -{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/cake_egg_cocotte_baked"}} +{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/egg_cocotte_baked"}} diff --git a/resources/mcmod.info b/resources/mcmod.info index 193faf86e..44d32fa3d 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -14,7 +14,7 @@ "name":"HeatAndClimateMod", "url":"http://defeatedcrow.jp/modwiki/HeatAndClimate", "updateUrl":"", - "version":"1.12.1_2.3.7", + "version":"1.12.1_2.3.8", "requiredMods":[ "Minecraft Forge1.10.2-12.18.3.2316+", "HeatAndClimateLib-1.10.2_2.3.0+" ]