- fix: いくつかのテクスチャ指定ミス

defeatedcrow · Apr 18, 2018 · 2e28985 · 2e28985
1 parent c192466
commit 2e28985
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,9 @@
+{
+    "forge_marker": 1,
+    "variants": {
+        "fluid": {
+            "model" : "forge:fluid",
+            "custom": { "fluid": "dcs.mazai" }
+        }
+    }
+}
diff --git a/resources/assets/dcs_climate/models/item/dcs_fluidblock_mazai.json 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
@@ -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
@@ -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
@@ -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+"
     ]