- fix: 液体パックの挙動

- fix: json自動出力処理の出力先を間違えた
defeatedcrow · Apr 17, 2018 · c192466 · c192466
1 parent 03bd597
commit c192466
Show file tree

Hide file tree

Showing 16 changed files with 68 additions and 25 deletions.
diff --git a/java/defeatedcrow/hac/food/item/FluidPaperContDC.java b/java/defeatedcrow/hac/food/item/FluidPaperContDC.java
@@ -2,7 +2,6 @@
 
 import javax.annotation.Nullable;
 
-import defeatedcrow.hac.food.FoodInit;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
@@ -41,16 +40,7 @@ public FluidStack getFluid() {
 	protected void setFluid(FluidStack resource) {
 		if (container.stackSize != 1 || resource == null || !canFillFluidType(resource))
 			return;
-		int meta = 0;
-		if (resource.getFluid() == FluidRegistry.WATER) {
-			meta = 1;
-		} else if (resource.getFluid() == FoodInit.cream) {
-			meta = 3;
-		} else if (resource.getFluid() == FoodInit.oil) {
-			meta = 4;
-		} else if (resource.getFluid().getName().contains("milk")) {
-			meta = 2;
-		}
+		int meta = ItemFluidPack.getMetaFromFluid(resource.getFluid());
 
 		if (meta == 0)
 			return;
@@ -71,16 +61,7 @@ public int fill(FluidStack resource, boolean doFill) {
 			return 0;
 
 		int fillAmo = 250;
-		int meta = 0;
-		if (resource.getFluid() == FluidRegistry.WATER) {
-			meta = 1;
-		} else if (resource.getFluid() == FoodInit.cream) {
-			meta = 3;
-		} else if (resource.getFluid() == FoodInit.oil) {
-			meta = 4;
-		} else if (resource.getFluid().getName().contains("milk")) {
-			meta = 2;
-		}
+		int meta = ItemFluidPack.getMetaFromFluid(resource.getFluid());
 
 		if (meta == 0)
 			return 0;

diff --git a/java/defeatedcrow/hac/food/item/ItemFluidPack.java b/java/defeatedcrow/hac/food/item/ItemFluidPack.java
@@ -8,16 +8,19 @@
 import defeatedcrow.hac.core.base.DCItem;
 import defeatedcrow.hac.core.util.DCUtil;
 import defeatedcrow.hac.food.FoodInit;
+import defeatedcrow.hac.machine.MachineInit;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.MobEffects;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.ActionResult;
+import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.SoundCategory;
@@ -136,7 +139,7 @@ public void addInformation2(ItemStack stack, @Nullable World world, List<String>
 			tooltip.add(TextFormatting.YELLOW.toString() + "Fluid: " + f.getLocalizedName(new FluidStack(f, 200)));
 			tooltip.add(TextFormatting.YELLOW.toString() + "Amount: " + 250);
 			Fluid milk = FluidRegistry.getFluid("milk");
-			if ((milk != null && f == milk) || f == FoodInit.tomatoJuice) {
+			if (i == 2 || f == FoodInit.tomatoJuice) {
 				tooltip.add(TextFormatting.AQUA.toString() + "clear all potion effects.");
 			} else if (f == FoodInit.mazai) {
 				tooltip.add(TextFormatting.RED.toString() + "Powerful but dangerous!");
@@ -169,6 +172,36 @@ public static Fluid getFluid(int meta) {
 		return FluidRegistry.getFluid(name);
 	}
 
+	public static int getMetaFromFluid(Fluid fluid) {
+		int meta = 0;
+		if (fluid == FluidRegistry.WATER) {
+			meta = 1;
+		} else if (fluid.getName().contains("milk")) {
+			meta = 2;
+		} else if (fluid == FoodInit.cream) {
+			meta = 3;
+		} else if (fluid == FoodInit.oil) {
+			meta = 4;
+		} else if (fluid == FoodInit.tomatoJuice) {
+			meta = 5;
+		} else if (fluid == FoodInit.lemon) {
+			meta = 6;
+		} else if (fluid == FoodInit.mazai) {
+			meta = 7;
+		} else if (fluid == FoodInit.greenTea) {
+			meta = 8;
+		} else if (fluid == FoodInit.blackTea) {
+			meta = 9;
+		} else if (fluid == FoodInit.coffee) {
+			meta = 10;
+		} else if (fluid == FoodInit.stock) {
+			meta = 11;
+		} else if (fluid == MachineInit.ethanol) {
+			meta = 12;
+		}
+		return meta;
+	}
+
 	/* 飲用効果 */
 
 	// カラなら飲食できない
@@ -219,6 +252,14 @@ public boolean addEffects(ItemStack stack, World worldIn, EntityLivingBase livin
 			List<PotionEffect> effects = ItemSilverCup.getPotionEffect(fluid, 1F, 1);
 			if (meta == 2 || fluid == FoodInit.tomatoJuice) {
 				living.clearActivePotions();
+				return false;
+			} else if (fluid == FoodInit.mazai) {
+				living.addPotionEffect(new PotionEffect(MobEffects.SATURATION, 2, 0));
+				living.heal(30.0F);
+				if (worldIn.rand.nextInt(100) == 0) {
+					living.attackEntityFrom(DamageSource.generic, 20.0F);
+				}
+				return false;
 			} else if (effects.isEmpty())
 				return false;
 			for (PotionEffect get : effects) {

diff --git a/java/defeatedcrow/hac/food/item/ItemSilverCup.java b/java/defeatedcrow/hac/food/item/ItemSilverCup.java
@@ -28,6 +28,7 @@
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.ActionResult;
+import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
@@ -165,6 +166,14 @@ public boolean addEffects(ItemStack stack, World world, EntityLivingBase living)
 						Fluid milk = FluidRegistry.getFluid("milk");
 						if ((milk != null && f.getFluid() == milk) || f.getFluid() == FoodInit.tomatoJuice) {
 							living.clearActivePotions();
+							return false;
+						} else if (f.getFluid() == FoodInit.mazai) {
+							living.addPotionEffect(new PotionEffect(MobEffects.SATURATION, 2, 0));
+							living.heal(30.0F);
+							if (world.rand.nextInt(100) == 0) {
+								living.attackEntityFrom(DamageSource.generic, 20.0F);
+							}
+							return false;
 						} else {
 							List<PotionEffect> effects = this.getPotionEffect(f.getFluid(), dirF, ampF);
 							if (effects.isEmpty())
@@ -224,6 +233,8 @@ public void addInformation2(ItemStack stack, @Nullable World world, List<String>
 				Fluid milk = FluidRegistry.getFluid("milk");
 				if ((milk != null && f.getFluid() == milk) || f.getFluid() == FoodInit.tomatoJuice) {
 					tooltip.add(TextFormatting.AQUA.toString() + "clear all potion effects.");
+				} else if (f.getFluid() == FoodInit.mazai) {
+					tooltip.add(TextFormatting.RED.toString() + "Powerful but dangerous!");
 				} else {
 					List<PotionEffect> effects = this.getPotionEffect(f.getFluid(), dirF, ampF);
 					if (!effects.isEmpty()) {

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 = 6;
+	public static final int MOD_BUILD = 7;
 	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/java/defeatedcrow/hac/main/client/JsonRegister.java b/java/defeatedcrow/hac/main/client/JsonRegister.java
@@ -15,7 +15,7 @@
 public class JsonRegister {
 
 	protected static final JsonRegisterHelper MAIN_INSTANCE = new JsonRegisterHelper(
-			"E:\\modding\\1.12.1\\hac_main_2\\src\\main\\resources");
+			"E:\\modding\\1.10.2\\hac_main\\src\\main\\resources");
 
 	public static void load() {
 		regItems();

diff --git a/resources/assets/dcs_climate/models/item/food/dcs_food_cake6.json b/resources/assets/dcs_climate/models/item/food/dcs_food_cake6.json
@@ -0,0 +1 @@
+{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/cake_berryjelly"}}
diff --git a/resources/assets/dcs_climate/models/item/food/dcs_food_cake7.json b/resources/assets/dcs_climate/models/item/food/dcs_food_cake7.json
@@ -0,0 +1 @@
+{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/cake_kuzujelly"}}
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
@@ -0,0 +1 @@
+{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/cake_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
@@ -0,0 +1 @@
+{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/cake_egg_cocotte_baked"}}
diff --git a/resources/assets/dcs_climate/models/item/food/dcs_food_pack10.json b/resources/assets/dcs_climate/models/item/food/dcs_food_pack10.json
@@ -0,0 +1 @@
+{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/pack_coffee"}}
diff --git a/resources/assets/dcs_climate/models/item/food/dcs_food_pack11.json b/resources/assets/dcs_climate/models/item/food/dcs_food_pack11.json
@@ -0,0 +1 @@
+{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/pack_stock"}}
diff --git a/resources/assets/dcs_climate/models/item/food/dcs_food_pack12.json b/resources/assets/dcs_climate/models/item/food/dcs_food_pack12.json
@@ -0,0 +1 @@
+{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/pack_ethanol"}}
diff --git a/resources/assets/dcs_climate/models/item/food/dcs_food_pack7.json b/resources/assets/dcs_climate/models/item/food/dcs_food_pack7.json
@@ -0,0 +1 @@
+{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/pack_mazai"}}
diff --git a/resources/assets/dcs_climate/models/item/food/dcs_food_pack8.json b/resources/assets/dcs_climate/models/item/food/dcs_food_pack8.json
@@ -0,0 +1 @@
+{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/pack_greentea"}}
diff --git a/resources/assets/dcs_climate/models/item/food/dcs_food_pack9.json b/resources/assets/dcs_climate/models/item/food/dcs_food_pack9.json
@@ -0,0 +1 @@
+{"parent":"item/generated","textures":{"layer0":"dcs_climate:items/food/pack_tea"}}
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.6",
+    "version":"1.12.1_2.3.7",
     "requiredMods":[
       "Minecraft Forge1.10.2-12.18.3.2316+", "HeatAndClimateLib-1.10.2_2.3.0+"
     ]