diff --git a/lang b/lang index c56c2c386..928f197a2 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit c56c2c386dc11c997212db64ebe4a2e5683a1766 +Subproject commit 928f197a21ee2fd866159c430ded0fddcf2bfb5c diff --git a/src/main/java/forestry/core/fluids/Fluids.java b/src/main/java/forestry/core/fluids/Fluids.java index 26fbd0392..79bbb74bd 100644 --- a/src/main/java/forestry/core/fluids/Fluids.java +++ b/src/main/java/forestry/core/fluids/Fluids.java @@ -211,7 +211,31 @@ public enum Fluids { @Override public EnumSet getContainerTypes() { return EnumSet.of( - EnumContainerType.BUCKET + EnumContainerType.BUCKET, + EnumContainerType.CAN, + EnumContainerType.CAPSULE, + EnumContainerType.REFRACTORY + ); + } + }, + MEAD("Mead", new Color(202, 102, 0), 1000, 1200) { + @Override + public String getTag() { + return "mead"; + } + + @Override + public Block makeBlock() { + return new BlockForestryFluid(this); + } + + @Override + public EnumSet getContainerTypes() { + return EnumSet.of( + EnumContainerType.BUCKET, + EnumContainerType.CAN, + EnumContainerType.CAPSULE, + EnumContainerType.REFRACTORY ); } }, @@ -260,7 +284,7 @@ public enum Fluids { CREOSOTE(new Color(0x635c03)), STEAM(new Color(0x91938F)); - public static final Fluids[] forestryFluids = {ETHANOL, BIOMASS, GLASS, HONEY, LEGACY_HONEY, ICE, JUICE, MILK, SEEDOIL, SHORT_MEAD}; + public static final Fluids[] forestryFluids = {ETHANOL, BIOMASS, GLASS, HONEY, LEGACY_HONEY, ICE, JUICE, MILK, SEEDOIL, SHORT_MEAD, MEAD}; private static final Map tagToFluid = new HashMap<>(); diff --git a/src/main/java/forestry/food/items/EnumBeverage.java b/src/main/java/forestry/food/items/EnumBeverage.java index 7f0c08751..98009c7ff 100644 --- a/src/main/java/forestry/food/items/EnumBeverage.java +++ b/src/main/java/forestry/food/items/EnumBeverage.java @@ -22,8 +22,8 @@ import forestry.core.render.TextureManager; public enum EnumBeverage implements ItemBeverage.IBeverageInfo { MEAD_SHORT("meadShort", "glass", new Color(0xec9a19), new Color(0xffffff), 1, 0.2f, true), - MEAD_CURATIVE("meadCurative", "glass", new Color(0xc5feff), new Color(0xffffff), 1, 0.2f, true); - + MEAD_CURATIVE("meadCurative", "glass", new Color(0xc5feff), new Color(0xffffff), 1, 0.2f, true), + MEAD("mead", "glass", new Color(0xcc6600), new Color(0xffffff), 8, 0.2f, true); public static final EnumBeverage[] VALUES = values(); private final String name; diff --git a/src/main/java/forestry/food/items/ItemBeverage.java b/src/main/java/forestry/food/items/ItemBeverage.java index a8d7d67b9..2c6783c6e 100755 --- a/src/main/java/forestry/food/items/ItemBeverage.java +++ b/src/main/java/forestry/food/items/ItemBeverage.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -68,7 +69,9 @@ public class ItemBeverage extends ItemForestryFood { itemstack.stackSize--; entityplayer.getFoodStats().func_151686_a(this, itemstack); world.playSoundAtEntity(entityplayer, "random.burp", 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); - + if(itemstack.stackSize == 0) { + itemstack = new ItemStack(Items.glass_bottle, 1); + } if (world.isRemote) { return itemstack; } diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 63668785a..727d59fc0 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -710,6 +710,8 @@ public class PluginApiculture extends ForestryPlugin { // / FERMENTER RecipeManagers.fermenterManager.addRecipe(items.honeydew.getItemStack(), 500, 1.0f, Fluids.SHORT_MEAD.getFluid(1), Fluids.HONEY.getFluid(1)); + // / STILL + RecipeManagers.stillManager.addRecipe(Constants.STILL_DESTILLATION_DURATION, Fluids.SHORT_MEAD.getFluid(10), Fluids.MEAD.getFluid(5)); } // ANALYZER diff --git a/src/main/java/forestry/plugins/PluginFood.java b/src/main/java/forestry/plugins/PluginFood.java index 61f3c179e..ee301304c 100755 --- a/src/main/java/forestry/plugins/PluginFood.java +++ b/src/main/java/forestry/plugins/PluginFood.java @@ -50,6 +50,7 @@ public class PluginFood extends ForestryPlugin { super.preInit(); LiquidRegistryHelper.registerLiquidContainer(Fluids.SHORT_MEAD, Constants.BUCKET_VOLUME, items.beverage.get(EnumBeverage.MEAD_SHORT, 1), new ItemStack(Items.glass_bottle)); + LiquidRegistryHelper.registerLiquidContainer(Fluids.MEAD, Constants.BUCKET_VOLUME, items.beverage.get(EnumBeverage.MEAD, 1), new ItemStack(Items.glass_bottle)); ItemRegistryApiculture beeItems = PluginApiculture.items; if (beeItems != null) { diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/mead_still.png b/src/main/resources/assets/forestry/textures/blocks/liquid/mead_still.png new file mode 100644 index 000000000..ee2f4e821 Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/liquid/mead_still.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/mead_still.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/mead_still.png.mcmeta new file mode 100644 index 000000000..0c36dcaa8 --- /dev/null +++ b/src/main/resources/assets/forestry/textures/blocks/liquid/mead_still.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"width":1,"height":32,"frametime":1,"frames":[{"index":0,"time":2},{"index":1,"time":2},{"index":2,"time":2},{"index":3,"time":2},{"index":4,"time":2},{"index":5,"time":2},{"index":6,"time":2},{"index":7,"time":2},{"index":8,"time":2},{"index":9,"time":2},{"index":10,"time":2},{"index":11,"time":2},{"index":12,"time":2},{"index":13,"time":2},{"index":14,"time":2},{"index":15,"time":2},{"index":16,"time":2},{"index":17,"time":2},{"index":18,"time":2},{"index":19,"time":2},{"index":20,"time":2},{"index":21,"time":2},{"index":22,"time":2},{"index":23,"time":2},{"index":24,"time":2},{"index":25,"time":2},{"index":26,"time":2},{"index":27,"time":2},{"index":28,"time":2},{"index":29,"time":2},{"index":30,"time":2},{"index":31,"time":2}]}} \ No newline at end of file