From 9807be1f8dc0926b16a7c9fe57e3383b851687eb Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Tue, 14 Aug 2018 16:12:42 -0400 Subject: [PATCH] made updates with new Core version need to update gradle properties --- .../forgecraft/blocks/Anvil/AnvilStone.java | 3 -- .../forgecraft/blocks/BloomeryBase.java | 5 +- .../forgecraft/blocks/CastingBlock.java | 53 ++++++++++--------- .../primal/forgecraft/blocks/CastingForm.java | 5 +- .../forgecraft/blocks/Crucibles/Crucible.java | 1 - .../blocks/Crucibles/NBTCrucible.java | 3 -- .../nmd/primal/forgecraft/blocks/Forge.java | 4 +- .../primal/forgecraft/blocks/IngotBall.java | 12 ----- .../primal/forgecraft/blocks/YewStave.java | 5 +- .../forgecraft/compat/ModDictionary.java | 1 - .../forgecraft/crafting/CrucibleCrafting.java | 2 - .../nmd/primal/forgecraft/init/ModBlocks.java | 15 ------ .../primal/forgecraft/init/ModCrafting.java | 17 +++--- .../nmd/primal/forgecraft/init/ModItems.java | 7 --- .../forgecraft/items/BaseMultiItem.java | 5 -- .../primal/forgecraft/items/ItemCrucible.java | 16 ------ .../forgecraft/items/ItemStoneTongs.java | 5 -- .../primal/forgecraft/items/SlottedTongs.java | 7 --- .../items/blocks/AbstractItemBlock.java | 1 - .../items/blocks/ItemNBTCrucible.java | 4 -- .../forgecraft/items/parts/ToolPart.java | 2 - .../forgecraft/items/weapons/Musket.java | 4 +- .../renders/blocks/TileAnvilRender.java | 1 - .../primal/forgecraft/tiles/TileAnvil.java | 7 --- .../primal/forgecraft/tiles/TileBloomery.java | 23 ++------ .../primal/forgecraft/tiles/TileForge.java | 10 ++-- .../forgecraft/tiles/TileNBTCrucible.java | 1 - .../primal/forgecraft/util/AnvilHandler.java | 5 -- .../forgecraft/util/BreakerHandler.java | 2 +- 29 files changed, 54 insertions(+), 172 deletions(-) diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java index 1a2be6c9..dbcecd2e 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java @@ -1,6 +1,5 @@ package nmd.primal.forgecraft.blocks.Anvil; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -10,9 +9,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.common.items.tools.Gallagher; -import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.tiles.TileAnvil; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java index c761e4f9..88c62094 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java @@ -11,7 +11,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.ItemStackHelper; -import net.minecraft.item.Item; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -27,11 +26,9 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.common.helper.PlayerHelper; -import nmd.primal.core.common.recipes.FireSource; +import nmd.primal.core.common.recipes.inworld.FireSource; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.crafting.BloomeryCrafting; import nmd.primal.forgecraft.crafting.CrucibleCrafting; -import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.SlottedTongs; import nmd.primal.forgecraft.tiles.TileBloomery; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java index 4f5a546d..33fd67e1 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java @@ -20,7 +20,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.init.ModBlocks; @@ -31,6 +30,8 @@ import nmd.primal.forgecraft.tiles.TileCastingBlock; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; +import static nmd.primal.core.api.PrimalAPI.randomCheck; + /** * Created by mminaie on 6/24/17. */ @@ -107,7 +108,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } //makeEmbers(world, pos, world.rand); @@ -118,7 +119,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -128,7 +129,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -138,7 +139,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -148,7 +149,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -180,7 +181,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -202,7 +203,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -224,7 +225,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -246,7 +247,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -256,7 +257,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -279,7 +280,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if (CommonUtils.randomCheck(2)) { + if (randomCheck(2)) { tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -300,7 +301,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if (CommonUtils.randomCheck(2)) { + if (randomCheck(2)) { tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -323,7 +324,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if (CommonUtils.randomCheck(2)) { + if (randomCheck(2)) { tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -346,7 +347,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if (CommonUtils.randomCheck(2)) { + if (randomCheck(2)) { tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -356,7 +357,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if (CommonUtils.randomCheck(2)) { + if (randomCheck(2)) { tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -379,7 +380,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -400,7 +401,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -423,7 +424,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -446,7 +447,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -456,7 +457,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -479,7 +480,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -500,7 +501,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -523,7 +524,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -546,7 +547,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; @@ -556,7 +557,7 @@ public class CastingBlock extends CustomContainerFacing { PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); pItem.getTagCompound().setInteger("type", 0); - if(CommonUtils.randomCheck(2)){ + if(randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } return true; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java index 58e66a42..52311953 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java @@ -18,13 +18,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.tiles.TileCastingForm; import nmd.primal.forgecraft.util.CastingFormHandler; import java.util.Random; +import static nmd.primal.core.api.PrimalAPI.randomCheck; + /** * Created by mminaie on 6/19/17. */ @@ -58,7 +59,7 @@ public class CastingForm extends CustomContainerFacing implements CastingFormHan public void updateTick(World world, BlockPos pos, IBlockState state, Random random) { if (!world.isRemote) { - if(CommonUtils.randomCheck(4)) { + if(randomCheck(4)) { TileCastingForm tile = (TileCastingForm) world.getTileEntity(pos); String[] tempArray = new String[25]; for (int i = 0; i < 25; i++) { diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java index 338d7666..b5c2a0b9 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java @@ -20,7 +20,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; import nmd.primal.forgecraft.CommonUtils; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.crafting.CrucibleCrafting; import nmd.primal.forgecraft.init.ModBlocks; import org.apache.commons.lang3.StringUtils; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java index 345f6d74..cf6cd0af 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java @@ -23,9 +23,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; -import nmd.primal.core.api.interfaces.IPickup; -import nmd.primal.core.api.interfaces.types.ITypeNBT; -import nmd.primal.core.api.interfaces.types.ITypeWood; import nmd.primal.core.common.helper.NBTHelper; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java index 23b4d171..9be840db 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java @@ -1,6 +1,5 @@ package nmd.primal.forgecraft.blocks; -import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -26,10 +25,9 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.common.helper.PlayerHelper; -import nmd.primal.core.common.recipes.FireSource; +import nmd.primal.core.common.recipes.inworld.FireSource; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.items.BaseMultiItem; -import nmd.primal.forgecraft.items.SlottedTongs; import nmd.primal.forgecraft.items.parts.ToolPart; import nmd.primal.forgecraft.tiles.TileForge; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java index 0ba107c2..cc0b3d99 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java @@ -1,6 +1,5 @@ package nmd.primal.forgecraft.blocks; -import net.minecraft.block.Block; import net.minecraft.block.BlockDynamicLiquid; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -10,25 +9,14 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import nmd.primal.core.api.PrimalAPI; -import nmd.primal.core.api.interfaces.IPickup; -import nmd.primal.core.common.helper.PlayerHelper; -import nmd.primal.core.common.items.tools.Gallagher; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.blocks.Anvil.AnvilBase; -import nmd.primal.forgecraft.blocks.Anvil.AnvilStone; -import nmd.primal.forgecraft.init.ModBlocks; -import nmd.primal.forgecraft.init.ModItems; -import nmd.primal.forgecraft.tiles.TileAnvil; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/YewStave.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/YewStave.java index 538d3e3a..b7477e76 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/YewStave.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/YewStave.java @@ -13,11 +13,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import nmd.primal.core.api.PrimalAPI; -import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.core.common.items.tools.WorkBlade; import nmd.primal.forgecraft.init.ModItems; +import static nmd.primal.core.api.PrimalAPI.randomCheck; + /** * Created by mminaie on 7/2/17. */ @@ -48,7 +49,7 @@ public class YewStave extends BlockCustomBase { if(world.getBlockState(pos.up()).getBlock() instanceof YewStave ) { //world.playSound(player, player.posX, player.posY, player.posZ, PrimalSounds.TOOL_BLADE_SCRAPE, SoundCategory.PLAYERS, 1.0F, 1F); world.playSound(null, pos, PrimalAPI.Sounds.SOUND_TOOL_BLADE_SCRAPE, SoundCategory.PLAYERS, 1.0F, 1.0F); - if(CommonUtils.randomCheck(3) ) { + if(randomCheck(3) ) { PlayerHelper.spawnItemOnGround(world, pos, new ItemStack(ModItems.rawlongbow, 1)); world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); world.setBlockState(pos.up(), Blocks.AIR.getDefaultState(), 2); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java index 2f68320f..77d6c5c9 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java @@ -1,7 +1,6 @@ package nmd.primal.forgecraft.compat; import net.minecraftforge.oredict.OreDictionary; -import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; /** diff --git a/kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java index eff1b965..e43c5eb6 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java @@ -2,9 +2,7 @@ package nmd.primal.forgecraft.crafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.NonNullList; -import javax.annotation.Nullable; import java.util.*; /** diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index 5515fbee..80085598 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -2,35 +2,20 @@ package nmd.primal.forgecraft.init; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.core.api.PrimalAPI; -import nmd.primal.core.common.helper.PlayerHelper; -import nmd.primal.core.common.items.tools.Gallagher; -import nmd.primal.forgecraft.blocks.Anvil.AnvilBase; import nmd.primal.forgecraft.blocks.Anvil.AnvilIron; import nmd.primal.forgecraft.blocks.Anvil.AnvilStone; import nmd.primal.forgecraft.blocks.*; import nmd.primal.forgecraft.blocks.Crucibles.Crucible; import nmd.primal.forgecraft.blocks.Crucibles.CrucibleHot; import nmd.primal.forgecraft.blocks.Crucibles.NBTCrucible; -import nmd.primal.forgecraft.items.ForgeHammer; -import nmd.primal.forgecraft.tiles.TileAnvil; /** * Created by kitsu on 11/26/2016. diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index 2a7a0f15..a9aa9ab7 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -1,21 +1,16 @@ package nmd.primal.forgecraft.init; -import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreIngredient; import nmd.primal.core.api.PrimalAPI; -import nmd.primal.core.common.helper.CommonUtils; -import nmd.primal.core.common.recipes.RecipeHandler; +import nmd.primal.core.common.recipes.irecipe.RecipeHandler; import nmd.primal.forgecraft.crafting.*; -import java.util.List; import java.util.Random; /** @@ -99,7 +94,7 @@ public class ModCrafting{ new OreIngredient("dustCopper"), new OreIngredient("dustTin"), Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.CAULDRON_SLAG, 1), + new ItemStack(PrimalAPI.Items.SLAG, 1), new ItemStack(ModItems.bronzeingotball, 1), 100, 100, @@ -111,7 +106,7 @@ public class ModCrafting{ Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.CAULDRON_SLAG, 1), + new ItemStack(PrimalAPI.Items.SLAG, 1), new ItemStack(ModItems.bronzeingotball, 1), 100, 100, @@ -127,7 +122,7 @@ public class ModCrafting{ Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.CAULDRON_SLAG, 1), + new ItemStack(PrimalAPI.Items.SLAG, 1), redBronze, 100, 100, @@ -1114,7 +1109,7 @@ public class ModCrafting{ empty,empty,diamond,empty,empty, empty,empty,empty,empty,empty, empty,empty,empty,empty,empty }, - new ItemStack(PrimalAPI.Items.DIAMOND_KNAPP, CommonUtils.randomChanceReturn(2, 2, 3)), + new ItemStack(PrimalAPI.Items.DIAMOND_KNAPP, PrimalAPI.randomChanceReturn(2, 2, 3)), "null" ); @@ -1221,7 +1216,7 @@ public class ModCrafting{ empty,empty,emerald,empty,empty, empty,empty,empty,empty,empty, empty,empty,empty,empty,empty }, - new ItemStack(PrimalAPI.Items.EMERALD_KNAPP, CommonUtils.randomChanceReturn(3, 2, 3)), + new ItemStack(PrimalAPI.Items.EMERALD_KNAPP, PrimalAPI.randomChanceReturn(3, 2, 3)), "null" ); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java index df6fcf4e..876d443d 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -1,21 +1,14 @@ package nmd.primal.forgecraft.init; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; -import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.blocks.Crucibles.NBTCrucible; import nmd.primal.forgecraft.items.*; import nmd.primal.forgecraft.items.armor.CustomHelmet; import nmd.primal.forgecraft.items.blocks.ItemNBTCrucible; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java b/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java index ca929ae4..181cbc53 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java @@ -1,24 +1,19 @@ package nmd.primal.forgecraft.items; import com.mojang.realmsclient.gui.ChatFormatting; -import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.init.ModItems; -import nmd.primal.forgecraft.items.blocks.ItemNBTCrucible; -import nmd.primal.forgecraft.items.parts.ToolPart; import javax.annotation.Nullable; import java.util.List; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/ItemCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/items/ItemCrucible.java index 4c4af328..65fb6e0e 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/ItemCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/ItemCrucible.java @@ -1,23 +1,7 @@ package nmd.primal.forgecraft.items; -import com.mojang.realmsclient.gui.ChatFormatting; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.init.ModItems; - -import javax.annotation.Nullable; -import java.util.List; /** * Created by mminaie on 11/11/17. diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java b/kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java index 97590c1e..bd55b0c1 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java @@ -15,18 +15,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.core.api.PrimalAPI; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.blocks.Crucibles.Crucible; import nmd.primal.forgecraft.blocks.Crucibles.CrucibleHot; -import nmd.primal.forgecraft.blocks.Forge; -import nmd.primal.forgecraft.blocks.IngotBall; import nmd.primal.forgecraft.init.ModBlocks; -import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.tiles.TileBaseCrucible; import nmd.primal.forgecraft.tiles.TileBloomery; -import nmd.primal.forgecraft.tiles.TileForge; import javax.annotation.Nullable; import java.util.List; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java b/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java index 009a31ae..83ce553e 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java @@ -1,13 +1,9 @@ package nmd.primal.forgecraft.items; import net.minecraft.block.Block; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -35,12 +31,9 @@ import nmd.primal.forgecraft.tiles.TileAnvil; import nmd.primal.forgecraft.tiles.TileForge; import nmd.primal.forgecraft.tiles.TileNBTCrucible; import nmd.primal.forgecraft.util.AnvilHandler; -import org.lwjgl.Sys; import javax.annotation.Nullable; -import static nmd.primal.forgecraft.blocks.CustomContainerFacing.FACING; - /** * Created by mminaie on 12/30/17. */ diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/blocks/AbstractItemBlock.java b/kfc/src/main/java/nmd/primal/forgecraft/items/blocks/AbstractItemBlock.java index d3ac00b5..7d8b72df 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/blocks/AbstractItemBlock.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/blocks/AbstractItemBlock.java @@ -5,7 +5,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import nmd.primal.core.api.interfaces.IFireProof; import nmd.primal.forgecraft.ModInfo; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/blocks/ItemNBTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/items/blocks/ItemNBTCrucible.java index 2376287d..98b0ea05 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/blocks/ItemNBTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/blocks/ItemNBTCrucible.java @@ -3,9 +3,7 @@ package nmd.primal.forgecraft.items.blocks; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.IItemPropertyGetter; -import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -13,9 +11,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.init.ModItems; import javax.annotation.Nullable; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/parts/ToolPart.java b/kfc/src/main/java/nmd/primal/forgecraft/items/parts/ToolPart.java index 55980139..36be20cb 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/parts/ToolPart.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/parts/ToolPart.java @@ -1,7 +1,6 @@ package nmd.primal.forgecraft.items.parts; import com.mojang.realmsclient.gui.ChatFormatting; -import net.minecraft.block.material.Material; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -19,7 +18,6 @@ import nmd.primal.forgecraft.util.ToolNBT; import javax.annotation.Nullable; import java.util.List; -import java.util.StringJoiner; /** * Created by mminaie on 3/9/17. diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java index 1fa8eb44..61194587 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java @@ -10,7 +10,7 @@ import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.core.common.entities.projectiles.EntityMud; +import nmd.primal.core.common.entities.projectiles.TypeMud; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.init.ModSounds; import nmd.primal.forgecraft.items.BaseItem; @@ -51,7 +51,7 @@ public class Musket extends BaseItem{ //if(player.getItemInUseCount() > 5) { world.playSound( null, player.posX, player.posY, player.posZ, ModSounds.MUSKET_SHOT, SoundCategory.BLOCKS, 0.5F, 0.3F / (itemRand.nextFloat() * 0.4F + 0.8F)); - EntityMud entity = new EntityMud(world, player); + TypeMud entity = new TypeMud(world, player); entity.setType("muck"); entity.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, 7.0F, 0.5F); world.spawnEntity(entity); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java index d0df1e0f..221ef359 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java @@ -17,7 +17,6 @@ import nmd.primal.core.api.PrimalAPI; import nmd.primal.forgecraft.blocks.Anvil.AnvilBase; import nmd.primal.forgecraft.blocks.Anvil.AnvilStone; import nmd.primal.forgecraft.blocks.IngotBall; -import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.tiles.TileAnvil; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileAnvil.java b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileAnvil.java index c4056673..50e9bbba 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileAnvil.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileAnvil.java @@ -1,17 +1,10 @@ package nmd.primal.forgecraft.tiles; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.ITickable; import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import nmd.primal.core.api.PrimalAPI; -import nmd.primal.forgecraft.init.ModBlocks; -import nmd.primal.forgecraft.init.ModItems; -import nmd.primal.forgecraft.items.parts.ToolPart; - -import java.util.concurrent.ThreadLocalRandom; /** * Created by mminaie on 3/4/17. diff --git a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java index 02f0fb76..c0301c84 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -5,8 +5,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.ItemStackHelper; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; @@ -14,17 +12,14 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import nmd.primal.core.api.PrimalAPI; -import nmd.primal.core.common.helper.CommonUtils; +import nmd.primal.core.common.helper.FireHelper; import nmd.primal.core.common.helper.RecipeHelper; import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.blocks.Crucibles.Crucible; import nmd.primal.forgecraft.blocks.Crucibles.NBTCrucible; -import nmd.primal.forgecraft.crafting.BloomeryCrafting; import nmd.primal.forgecraft.crafting.CrucibleCrafting; import nmd.primal.forgecraft.init.ModItems; -import static nmd.primal.core.common.helper.FireHelper.makeSmoke; - /** * Created by mminaie on 1/22/17. */ @@ -49,15 +44,11 @@ public class TileBloomery extends TileBaseSlot implements ITickable { this.iteration++; if (this.iteration == 100) { RecipeHelper.fuelManager(world,this, this.getSlotStack(0)); - if(CommonUtils.randomCheck(1000)) { - makeSmoke(world, pos); - } + FireHelper.makeSmoke(world, pos, 1000); } if (this.iteration == 200) { RecipeHelper.fuelManager(world, this, this.getSlotStack(0)); - if(CommonUtils.randomCheck(1000)) { - makeSmoke(world, pos); - } + FireHelper.makeSmoke(world, pos, 1000); } if (this.iteration == 300) { this.iteration = 0; @@ -70,9 +61,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { } this.heatManager(this.getHeat(), state, this.getSlotStack(0), world, pos); RecipeHelper.fuelManager(world, this, this.getSlotStack(0)); - if(CommonUtils.randomCheck(1000)) { - makeSmoke(world, pos); - } + FireHelper.makeSmoke(world, pos, 1000); } slotOneManager(); } @@ -200,9 +189,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { this.markDirty(); this.updateBlock(); } - if(CommonUtils.randomCheck(1000)) { - makeSmoke(world, pos); - } + FireHelper.makeSmoke(world, pos, 1000); } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java index 075979d5..95eb2f65 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java @@ -10,7 +10,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import nmd.primal.core.api.PrimalAPI; -import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.core.common.helper.RecipeHelper; import nmd.primal.forgecraft.blocks.Forge; import nmd.primal.forgecraft.crafting.ForgeCrafting; @@ -18,6 +17,7 @@ import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.items.parts.ToolPart; import nmd.primal.forgecraft.util.ToolNBT; +import static nmd.primal.core.api.PrimalAPI.randomCheck; import static nmd.primal.core.common.helper.FireHelper.makeSmoke; /** @@ -45,13 +45,13 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{ if (this.iteration == 100) { RecipeHelper.fuelManager(world, this, this.getSlotStack(0)); - if(CommonUtils.randomCheck(1000)) { + if(randomCheck(1000)) { makeSmoke(world, pos); } } if (this.iteration == 200) { RecipeHelper.fuelManager(world, this, this.getSlotStack(0)); - if(CommonUtils.randomCheck(1000)) { + if(randomCheck(1000)) { makeSmoke(world, pos); } } @@ -66,7 +66,7 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{ world.notifyBlockUpdate(pos, state, state, 2); } RecipeHelper.fuelManager(world, this, this.getSlotStack(0)); - if(CommonUtils.randomCheck(1000)) { + if(randomCheck(1000)) { makeSmoke(world, pos); } this.heatManager(this.getHeat(), state, this.getSlotStack(0), world, pos); @@ -111,7 +111,7 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{ this.markDirty(); this.updateBlock(); } - if(CommonUtils.randomCheck(1000)) { + if(randomCheck(1000)) { makeSmoke(world, pos); } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java index 5f4509f1..c9f49885 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java @@ -2,7 +2,6 @@ package nmd.primal.forgecraft.tiles; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.ItemStackHelper; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java index dbe93c36..e987080e 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java @@ -4,20 +4,15 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.common.items.tools.Gallagher; import nmd.primal.forgecraft.CommonUtils; import nmd.primal.forgecraft.blocks.IngotBall; import nmd.primal.forgecraft.crafting.AnvilCrafting; -import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.items.ForgeHammer; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java index 7be0aa8f..aafcfb94 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java @@ -13,7 +13,7 @@ import nmd.primal.core.common.helper.RecipeHelper; import nmd.primal.forgecraft.blocks.CustomContainerFacing; import nmd.primal.forgecraft.tiles.TileBreaker; -import static nmd.primal.core.common.helper.CommonUtils.randomChanceReturn; +import static nmd.primal.core.api.PrimalAPI.randomChanceReturn; //import nmd.primal.forgecraft.CommonUtils;