Skip to content

Commit

Permalink
1.12.2zd final
Browse files Browse the repository at this point in the history
  • Loading branch information
MatrexsVigil committed May 29, 2019
1 parent 8e5f786 commit 79ed308
Show file tree
Hide file tree
Showing 26 changed files with 244 additions and 27 deletions.
7 changes: 6 additions & 1 deletion src/Fixes.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

cropGrowthSpeed config option can't be set to negative
Add Tomatillo crop in exchange for Moonlighter
Add Dogwood tree (drops bones, special sapling dungeon drop) for Forager


MAKE PRESSER RECIPES USE ORE DICTIONARY

Expand All @@ -24,6 +28,7 @@ Bee Sandwich - 3 queen bees, bread, butter

Add "Chiliwowaz Special" under Chimichanga

Add soy fish
I'm working on Harvestcraft 1.12.21zb, and the foods used to have identifiers for saturation level, and now that all harvestcraft foods do the same saturation, they've been removed... but would it be possible to fill this same field with some kind of wording (maybe even the same words) which instead of indicating the saturation level it restores, indicates the hunger level restored / Tier of the meal?

I ask not only because the tiers of meals is COMPLETELY vague in the existing version and configs, but also because I used to be able to search in JEI for exactly the tier of meal I wanted, by for instance searching "snack" and it'd find all snacks, now the only way for me to get JEI to return all meals is to search @pam's, which returns all the component foods, tools, and machines as well. I think these labels gave us something valuable. It'd be nice if there was some way to show them again.

13 changes: 12 additions & 1 deletion src/Pam's HarvestCraft 1.12 Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
HarvestCraft 1.12.2zc
HarvestCraft 1.12.2zd
-----------------
- Fixed: Machine: Machines should now keep inventories when rotated/moved
- Fixed: Recipe: Cucumber Sandwich and cassoulet recipe JSONs
- Fixed: Name: BBQ Chicken Biscuit, Chicken Biscuit, Caesar Salad, Banana Milkshake all named correctly
- Fixed: Recipe: Recipes with listAlljuice now work correctly
- Fixed: Config: cropsdropSeeds now correctly works when set to True
- Fixed: Fruit Blocks: Mature fruits should no longer instantly break: NOTE: PLEASE tell me if this messes with Dynamic Trees, thank you
- Added: Item: Pizza Slice (created by putting pizza items in the crafting grid w/cutting board), for the Yogscast


HarvestCraft 1.12.2zc
-----------------
This update took so long because of my near full hysterectomy surgery and recovery, trying to lose weight via exercise, my 'accused' rapist coming back into my life via me learning he had hurt other people and me having to help those people, and me getting a 7mm kidney stone. These aren't excuses, just facts. I'm sorry this took so long. Love you all! <3

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class BlockPamCrop extends BlockCrops implements IGrowable, IPlantable, P
public void setSeed(Item seed) {
if(ConfigHandler.cropsdropSeeds) {
this.seed = seed;
}
} else
this.seed = food;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,13 @@ public BlockPamSapling getSapling() {
@Override
public float getBlockHardness(IBlockState blockState, World worldIn, BlockPos pos) {
if(getMetaFromState(blockState) >= MATURE_AGE) {
return 0f;
}
return 2f;
} else

return 5f;
}



public String getStageId(int stage) {
if(BASE_STAGE_ID == null) {
Expand Down
32 changes: 30 additions & 2 deletions src/main/java/com/pam/harvestcraft/item/GeneralOreRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public class GeneralOreRegistry {
public static final String listAllsoda = "listAllsoda";
public static final String listAlltofu = "listAlltofu";
public static final String listAllyogurt = "listAllyogurt";
public static final String listAlljuice = "listAlljuice";

// Food ores
public static final String bread="bread";
Expand Down Expand Up @@ -365,7 +366,6 @@ public class GeneralOreRegistry {
public static final String foodGrilledcheese="foodGrilledcheese";
public static final String foodApplesauce="foodApplesauce";
public static final String foodApplejuice="foodApplejuice";
public static final String listAlljuice="listAlljuice";
public static final String foodApplepie="foodApplepie";
public static final String foodCaramelapple="foodCaramelapple";
public static final String foodPumpkinbread="foodPumpkinbread";
Expand Down Expand Up @@ -1260,6 +1260,7 @@ public class GeneralOreRegistry {
public static final String foodMarshmellowchicks="foodMarshmellowchicks";
public static final String foodBbqchickenbiscuit="foodBbqchickenbiscuit";
public static final String foodChickenbiscuit="foodChickenbiscuit";
public static final String foodPizzaslice="foodPizzaslice";


public static void initOreRegistry() {
Expand Down Expand Up @@ -1433,6 +1434,33 @@ private static void registerFoodOres() {
}

registerOres(listAlljuice, ItemRegistry.allJuice);

registerOres(listAlljuice,
ItemRegistry.applejuiceItem,
ItemRegistry.melonjuiceItem,
ItemRegistry.carrotjuiceItem,
ItemRegistry.strawberryjuiceItem,
ItemRegistry.grapejuiceItem,
ItemRegistry.blueberryjuiceItem,
ItemRegistry.cherryjuiceItem,
ItemRegistry.papayajuiceItem,
ItemRegistry.starfruitjuiceItem,
ItemRegistry.orangejuiceItem,
ItemRegistry.peachjuiceItem,
ItemRegistry.limejuiceItem,
ItemRegistry.mangojuiceItem,
ItemRegistry.pomegranatejuiceItem,
ItemRegistry.blackberryjuiceItem,
ItemRegistry.raspberryjuiceItem,
ItemRegistry.kiwijuiceItem,
ItemRegistry.cranberryjuiceItem,
ItemRegistry.cactusfruitjuiceItem,
ItemRegistry.plumjuiceItem,
ItemRegistry.pearjuiceItem,
ItemRegistry.apricotjuiceItem,
ItemRegistry.figjuiceItem,
ItemRegistry.grapefruitjuiceItem,
ItemRegistry.persimmonjuiceItem);

registerOres(listAllveggie,
Items.CARROT,
Expand Down Expand Up @@ -2984,7 +3012,7 @@ private static void registerFoodOres() {
OreDictionary.registerOre(foodMarshmellowchicks, ItemRegistry.marshmellowchicksItem);
OreDictionary.registerOre(foodBbqchickenbiscuit, ItemRegistry.bbqchickenbiscuitItem);
OreDictionary.registerOre(foodChickenbiscuit, ItemRegistry.chickenbiscuitItem);
OreDictionary.registerOre(foodPizzaslice, ItemRegistry.pizzasliceItem);
}

private static void registerOres(String key, Object... items) {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/pam/harvestcraft/item/ItemRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -1087,6 +1087,8 @@ public final class ItemRegistry {
public static Item marshmellowchicksItem;
public static Item bbqchickenbiscuitItem;
public static Item chickenbiscuitItem;

public static Item pizzasliceItem;

public static boolean initialized = false;

Expand Down Expand Up @@ -2023,6 +2025,8 @@ private static void registerFoodItems() {
cinnamonbreadItem = registerItemFood("cinnamonbreaditem", 6, config.mealsaturation);
cornchipsItem = registerItemFood("cornchipsitem", 3, config.mealsaturation);
marshmellowchicksItem = registerItemFood("marshmellowchicksitem", 6, config.mealsaturation);

pizzasliceItem = registerItemFood("pizzasliceitem", 2, config.mealsaturation);

groundbeefItem = registerGenericItem("groundbeefitem");
groundchickenItem = registerGenericItem("groundchickenitem");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import net.minecraft.block.Block;
import net.minecraft.block.BlockCrops;
import net.minecraft.block.BlockFlower;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.IInventory;
Expand All @@ -25,6 +26,7 @@
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.items.CapabilityItemHandler;
Expand Down Expand Up @@ -285,6 +287,11 @@ public boolean canInteractWith(EntityPlayer playerIn) {
// If we are too far away from this tile entity you cannot use it
return !isInvalid() && playerIn.getDistanceSq(pos.add(0.5D, 0.5D, 0.5D)) <= 64D;
}

@Override
public boolean shouldRefresh(World world, BlockPos pos,@Nonnull IBlockState oldState,@Nonnull IBlockState newState) {
return oldState.getBlock() != newState.getBlock();
}

public String getGuiID() {
return "harvestcraft:apiary";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.pam.harvestcraft.item.GrinderRecipes;
import com.pam.harvestcraft.item.PresserRecipes;

import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
Expand All @@ -14,6 +15,8 @@
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.fml.relauncher.Side;
Expand Down Expand Up @@ -208,6 +211,11 @@ public boolean canInteractWith(EntityPlayer playerIn) {
// If we are too far away from this tile entity you cannot use it
return !isInvalid() && playerIn.getDistanceSq(pos.add(0.5D, 0.5D, 0.5D)) <= 64D;
}

@Override
public boolean shouldRefresh(World world, BlockPos pos,@Nonnull IBlockState oldState,@Nonnull IBlockState newState) {
return oldState.getBlock() != newState.getBlock();
}

public String getGuiID() {
return "harvestcraft:grinder";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import net.minecraft.block.Block;
import net.minecraft.block.BlockDirt;
import net.minecraft.block.BlockGrass;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
Expand All @@ -23,6 +24,7 @@
import net.minecraft.util.ITickable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.items.CapabilityItemHandler;
Expand Down Expand Up @@ -362,6 +364,11 @@ public boolean canInteractWith(EntityPlayer playerIn) {
// If we are too far away from this tile entity you cannot use it
return !isInvalid() && playerIn.getDistanceSq(pos.add(0.5D, 0.5D, 0.5D)) <= 64D;
}

@Override
public boolean shouldRefresh(World world, BlockPos pos,@Nonnull IBlockState oldState,@Nonnull IBlockState newState) {
return oldState.getBlock() != newState.getBlock();
}

public String getGuiID() {
return "harvestcraft:groundtrap";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
package com.pam.harvestcraft.tileentities;

import javax.annotation.Nonnull;

import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.ItemStackHandler;
Expand Down Expand Up @@ -75,6 +80,11 @@ public boolean canInteractWith(EntityPlayer playerIn) {
// If we are too far away from this tile entity you cannot use it
return !isInvalid() && playerIn.getDistanceSq(pos.add(0.5D, 0.5D, 0.5D)) <= 64D;
}

@Override
public boolean shouldRefresh(World world, BlockPos pos,@Nonnull IBlockState oldState,@Nonnull IBlockState newState) {
return oldState.getBlock() != newState.getBlock();
}

public String getGuiID() {
return "harvestcraft:market";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.pam.harvestcraft.gui.SlotPamPresser;
import com.pam.harvestcraft.item.PresserRecipes;

import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
Expand All @@ -14,6 +15,8 @@
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.fml.relauncher.Side;
Expand Down Expand Up @@ -209,6 +212,11 @@ public boolean canInteractWith(EntityPlayer playerIn) {
// If we are too far away from this tile entity you cannot use it
return !isInvalid() && playerIn.getDistanceSq(pos.add(0.5D, 0.5D, 0.5D)) <= 64D;
}

@Override
public boolean shouldRefresh(World world, BlockPos pos,@Nonnull IBlockState oldState,@Nonnull IBlockState newState) {
return oldState.getBlock() != newState.getBlock();
}

public String getGuiID() {
return "harvestcraft:presser";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
package com.pam.harvestcraft.tileentities;

import javax.annotation.Nonnull;

import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.ItemStackHandler;
Expand Down Expand Up @@ -74,6 +79,12 @@ public boolean canInteractWith(EntityPlayer playerIn) {
// If we are too far away from this tile entity you cannot use it
return !isInvalid() && playerIn.getDistanceSq(pos.add(0.5D, 0.5D, 0.5D)) <= 64D;
}

@Override
public boolean shouldRefresh(World world, BlockPos pos,@Nonnull IBlockState oldState,@Nonnull IBlockState newState) {
return oldState.getBlock() != newState.getBlock();
}


public String getGuiID() {
return "harvestcraft:shippingbin";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.pam.harvestcraft.item.WaterFilterRecipes;

import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
Expand All @@ -18,6 +19,7 @@
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.fml.relauncher.Side;
Expand Down Expand Up @@ -245,6 +247,11 @@ public boolean canInteractWith(EntityPlayer playerIn) {
return !isInvalid() && playerIn.getDistanceSq(pos.add(0.5D, 0.5D, 0.5D)) <= 64D;
}

@Override
public boolean shouldRefresh(World world, BlockPos pos,@Nonnull IBlockState oldState,@Nonnull IBlockState newState) {
return oldState.getBlock() != newState.getBlock();
}

public String getGuiID() {
return "harvestcraft:waterfilter";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLiquid;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
Expand All @@ -23,6 +24,7 @@
import net.minecraft.util.ITickable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.items.CapabilityItemHandler;
Expand Down Expand Up @@ -354,6 +356,11 @@ public boolean canInteractWith(EntityPlayer playerIn) {
return !isInvalid() && playerIn.getDistanceSq(pos.add(0.5D, 0.5D, 0.5D)) <= 64D;
}

@Override
public boolean shouldRefresh(World world, BlockPos pos,@Nonnull IBlockState oldState,@Nonnull IBlockState newState) {
return oldState.getBlock() != newState.getBlock();
}

public String getGuiID() {
return "harvestcraft:watertrap";
}
Expand Down
Loading

0 comments on commit 79ed308

Please sign in to comment.