nmd/ForgeCraft
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

made updates with new Core version need to update gradle properties

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2018-08-14 16:12:42 -04:00
parent fdc0d90144
commit 9807be1f8d
29 changed files with 54 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java
View File

@@ -1,6 +1,5 @@
package nmd.primal.forgecraft.blocks.Anvil; package nmd.primal.forgecraft.blocks.Anvil;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@@ -10,9 +9,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import nmd.primal.core.api.PrimalAPI;
import nmd.primal.core.common.items.tools.Gallagher; import nmd.primal.core.common.items.tools.Gallagher;
import nmd.primal.forgecraft.init.ModBlocks;
import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.init.ModItems;
import nmd.primal.forgecraft.tiles.TileAnvil; import nmd.primal.forgecraft.tiles.TileAnvil;

5
kfc/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java
View File

@@ -11,7 +11,6 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents; import net.minecraft.init.SoundEvents;
import net.minecraft.inventory.ItemStackHelper; import net.minecraft.inventory.ItemStackHelper;
import net.minecraft.item.Item;
import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@@ -27,11 +26,9 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.api.PrimalAPI;
import nmd.primal.core.common.helper.PlayerHelper; 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.ModInfo;
import nmd.primal.forgecraft.crafting.BloomeryCrafting;
import nmd.primal.forgecraft.crafting.CrucibleCrafting; import nmd.primal.forgecraft.crafting.CrucibleCrafting;
import nmd.primal.forgecraft.init.ModItems;
import nmd.primal.forgecraft.items.SlottedTongs; import nmd.primal.forgecraft.items.SlottedTongs;
import nmd.primal.forgecraft.tiles.TileBloomery; import nmd.primal.forgecraft.tiles.TileBloomery;

53
kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java
View File

@@ -20,7 +20,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.common.helper.CommonUtils;
import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.core.common.helper.PlayerHelper;
import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModBlocks;
@@ -31,6 +30,8 @@ import nmd.primal.forgecraft.tiles.TileCastingBlock;
import java.util.Random; import java.util.Random;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import static nmd.primal.core.api.PrimalAPI.randomCheck;
/** /**
* Created by mminaie on 6/24/17. * 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, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
//makeEmbers(world, pos, world.rand); //makeEmbers(world, pos, world.rand);
@@ -118,7 +119,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -128,7 +129,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -138,7 +139,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -148,7 +149,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -180,7 +181,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -202,7 +203,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -224,7 +225,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -246,7 +247,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -256,7 +257,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -279,7 +280,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if (CommonUtils.randomCheck(2)) { if (randomCheck(2)) {
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -300,7 +301,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if (CommonUtils.randomCheck(2)) { if (randomCheck(2)) {
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -323,7 +324,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if (CommonUtils.randomCheck(2)) { if (randomCheck(2)) {
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -346,7 +347,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if (CommonUtils.randomCheck(2)) { if (randomCheck(2)) {
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -356,7 +357,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if (CommonUtils.randomCheck(2)) { if (randomCheck(2)) {
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -379,7 +380,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -400,7 +401,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -423,7 +424,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -446,7 +447,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -456,7 +457,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -479,7 +480,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -500,7 +501,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -523,7 +524,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -546,7 +547,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;
@@ -556,7 +557,7 @@ public class CastingBlock extends CustomContainerFacing {
PlayerHelper.spawnItemOnGround(world, pos, dropStack); PlayerHelper.spawnItemOnGround(world, pos, dropStack);
PlayerHelper.spawnItemOnGround(world, pos, dropCrucible); PlayerHelper.spawnItemOnGround(world, pos, dropCrucible);
pItem.getTagCompound().setInteger("type", 0); pItem.getTagCompound().setInteger("type", 0);
if(CommonUtils.randomCheck(2)){ if(randomCheck(2)){
tile.setSlotStack(0, ItemStack.EMPTY); tile.setSlotStack(0, ItemStack.EMPTY);
} }
return true; return true;

5
kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java
View File

@@ -18,13 +18,14 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.common.helper.CommonUtils;
import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.tiles.TileCastingForm; import nmd.primal.forgecraft.tiles.TileCastingForm;
import nmd.primal.forgecraft.util.CastingFormHandler; import nmd.primal.forgecraft.util.CastingFormHandler;
import java.util.Random; import java.util.Random;
import static nmd.primal.core.api.PrimalAPI.randomCheck;
/** /**
* Created by mminaie on 6/19/17. * 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) public void updateTick(World world, BlockPos pos, IBlockState state, Random random)
{ {
if (!world.isRemote) { if (!world.isRemote) {
if(CommonUtils.randomCheck(4)) { if(randomCheck(4)) {
TileCastingForm tile = (TileCastingForm) world.getTileEntity(pos); TileCastingForm tile = (TileCastingForm) world.getTileEntity(pos);
String[] tempArray = new String[25]; String[] tempArray = new String[25];
for (int i = 0; i < 25; i++) { for (int i = 0; i < 25; i++) {

1
kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java
View File

@@ -20,7 +20,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.api.PrimalAPI;
import nmd.primal.forgecraft.CommonUtils; import nmd.primal.forgecraft.CommonUtils;
import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.crafting.CrucibleCrafting;
import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModBlocks;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

3
kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java
View File

@@ -23,9 +23,6 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.api.PrimalAPI; 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.NBTHelper;
import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.core.common.helper.PlayerHelper;
import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.ModInfo;

4
kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java
View File

@@ -1,6 +1,5 @@
package nmd.primal.forgecraft.blocks; package nmd.primal.forgecraft.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
@@ -26,10 +25,9 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.api.PrimalAPI;
import nmd.primal.core.common.helper.PlayerHelper; 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.ModInfo;
import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.items.BaseMultiItem;
import nmd.primal.forgecraft.items.SlottedTongs;
import nmd.primal.forgecraft.items.parts.ToolPart; import nmd.primal.forgecraft.items.parts.ToolPart;
import nmd.primal.forgecraft.tiles.TileForge; import nmd.primal.forgecraft.tiles.TileForge;

12
kfc/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java
View File

@@ -1,6 +1,5 @@
package nmd.primal.forgecraft.blocks; package nmd.primal.forgecraft.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDynamicLiquid; import net.minecraft.block.BlockDynamicLiquid;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
@@ -10,25 +9,14 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.SoundEvents; import net.minecraft.init.SoundEvents;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import nmd.primal.core.api.PrimalAPI; 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.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.Random;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;

5
kfc/src/main/java/nmd/primal/forgecraft/blocks/YewStave.java
View File

@@ -13,11 +13,12 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import nmd.primal.core.api.PrimalAPI; 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.helper.PlayerHelper;
import nmd.primal.core.common.items.tools.WorkBlade; import nmd.primal.core.common.items.tools.WorkBlade;
import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.init.ModItems;
import static nmd.primal.core.api.PrimalAPI.randomCheck;
/** /**
* Created by mminaie on 7/2/17. * Created by mminaie on 7/2/17.
*/ */
@@ -48,7 +49,7 @@ public class YewStave extends BlockCustomBase {
if(world.getBlockState(pos.up()).getBlock() instanceof YewStave ) { 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(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); 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)); PlayerHelper.spawnItemOnGround(world, pos, new ItemStack(ModItems.rawlongbow, 1));
world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
world.setBlockState(pos.up(), Blocks.AIR.getDefaultState(), 2); world.setBlockState(pos.up(), Blocks.AIR.getDefaultState(), 2);

1
kfc/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java
View File

@@ -1,7 +1,6 @@
package nmd.primal.forgecraft.compat; package nmd.primal.forgecraft.compat;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import nmd.primal.forgecraft.init.ModBlocks;
import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.init.ModItems;
/** /**

2
kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java
View File

@@ -2,9 +2,7 @@ package nmd.primal.forgecraft.crafting;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.NonNullList;
import javax.annotation.Nullable;
import java.util.*; import java.util.*;
/** /**

15
kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java
View File

@@ -2,35 +2,20 @@ package nmd.primal.forgecraft.init;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.ModelResourceLocation; 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.Item;
import net.minecraft.item.ItemBlock; 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.client.model.ModelLoader;
import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.ForgeRegistries;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; 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.AnvilIron;
import nmd.primal.forgecraft.blocks.Anvil.AnvilStone; import nmd.primal.forgecraft.blocks.Anvil.AnvilStone;
import nmd.primal.forgecraft.blocks.*; import nmd.primal.forgecraft.blocks.*;
import nmd.primal.forgecraft.blocks.Crucibles.Crucible; import nmd.primal.forgecraft.blocks.Crucibles.Crucible;
import nmd.primal.forgecraft.blocks.Crucibles.CrucibleHot; import nmd.primal.forgecraft.blocks.Crucibles.CrucibleHot;
import nmd.primal.forgecraft.blocks.Crucibles.NBTCrucible; 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. * Created by kitsu on 11/26/2016.

17
kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java
View File

@@ -1,21 +1,16 @@
package nmd.primal.forgecraft.init; package nmd.primal.forgecraft.init;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.Ingredient;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.OreIngredient; import net.minecraftforge.oredict.OreIngredient;
import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.api.PrimalAPI;
import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.core.common.recipes.irecipe.RecipeHandler;
import nmd.primal.core.common.recipes.RecipeHandler;
import nmd.primal.forgecraft.crafting.*; import nmd.primal.forgecraft.crafting.*;
import java.util.List;
import java.util.Random; import java.util.Random;
/** /**
@@ -99,7 +94,7 @@ public class ModCrafting{
new OreIngredient("dustCopper"), new OreIngredient("dustCopper"),
new OreIngredient("dustTin"), new OreIngredient("dustTin"),
Ingredient.EMPTY, Ingredient.EMPTY,
new ItemStack(PrimalAPI.Items.CAULDRON_SLAG, 1), new ItemStack(PrimalAPI.Items.SLAG, 1),
new ItemStack(ModItems.bronzeingotball, 1), new ItemStack(ModItems.bronzeingotball, 1),
100, 100,
100, 100,
@@ -111,7 +106,7 @@ public class ModCrafting{
Ingredient.EMPTY, Ingredient.EMPTY,
Ingredient.EMPTY, Ingredient.EMPTY,
Ingredient.EMPTY, Ingredient.EMPTY,
new ItemStack(PrimalAPI.Items.CAULDRON_SLAG, 1), new ItemStack(PrimalAPI.Items.SLAG, 1),
new ItemStack(ModItems.bronzeingotball, 1), new ItemStack(ModItems.bronzeingotball, 1),
100, 100,
100, 100,
@@ -127,7 +122,7 @@ public class ModCrafting{
Ingredient.EMPTY, Ingredient.EMPTY,
Ingredient.EMPTY, Ingredient.EMPTY,
Ingredient.EMPTY, Ingredient.EMPTY,
new ItemStack(PrimalAPI.Items.CAULDRON_SLAG, 1), new ItemStack(PrimalAPI.Items.SLAG, 1),
redBronze, redBronze,
100, 100,
100, 100,
@@ -1114,7 +1109,7 @@ public class ModCrafting{
empty,empty,diamond,empty,empty, empty,empty,diamond,empty,empty,
empty,empty,empty,empty,empty, empty,empty,empty,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" "null"
); );
@@ -1221,7 +1216,7 @@ public class ModCrafting{
empty,empty,emerald,empty,empty, empty,empty,emerald,empty,empty,
empty,empty,empty,empty,empty, empty,empty,empty,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" "null"
); );

7
kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java
View File

@@ -1,21 +1,14 @@
package nmd.primal.forgecraft.init; package nmd.primal.forgecraft.init;
import net.minecraft.client.Minecraft; 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.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock; 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.common.registry.ForgeRegistries;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.api.PrimalAPI; 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.*;
import nmd.primal.forgecraft.items.armor.CustomHelmet; import nmd.primal.forgecraft.items.armor.CustomHelmet;
import nmd.primal.forgecraft.items.blocks.ItemNBTCrucible; import nmd.primal.forgecraft.items.blocks.ItemNBTCrucible;

5
kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java
View File

@@ -1,24 +1,19 @@
package nmd.primal.forgecraft.items; package nmd.primal.forgecraft.items;
import com.mojang.realmsclient.gui.ChatFormatting; import com.mojang.realmsclient.gui.ChatFormatting;
import net.minecraft.block.Block;
import net.minecraft.client.util.ITooltipFlag; import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.init.ModItems; 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 javax.annotation.Nullable;
import java.util.List; import java.util.List;

16
kfc/src/main/java/nmd/primal/forgecraft/items/ItemCrucible.java
View File

@@ -1,23 +1,7 @@
package nmd.primal.forgecraft.items; 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.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.ModInfo;
import nmd.primal.forgecraft.init.ModItems;
import javax.annotation.Nullable;
import java.util.List;
/** /**
* Created by mminaie on 11/11/17. * Created by mminaie on 11/11/17.

5
kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java
View File

@@ -15,18 +15,13 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.api.PrimalAPI;
import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.blocks.BloomeryBase;
import nmd.primal.forgecraft.blocks.Crucibles.Crucible; import nmd.primal.forgecraft.blocks.Crucibles.Crucible;
import nmd.primal.forgecraft.blocks.Crucibles.CrucibleHot; 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.ModBlocks;
import nmd.primal.forgecraft.init.ModItems;
import nmd.primal.forgecraft.tiles.TileBaseCrucible; import nmd.primal.forgecraft.tiles.TileBaseCrucible;
import nmd.primal.forgecraft.tiles.TileBloomery; import nmd.primal.forgecraft.tiles.TileBloomery;
import nmd.primal.forgecraft.tiles.TileForge;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;

7
kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java
View File

@@ -1,13 +1,9 @@
package nmd.primal.forgecraft.items; package nmd.primal.forgecraft.items;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; 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.IItemPropertyGetter;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock; 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.TileForge;
import nmd.primal.forgecraft.tiles.TileNBTCrucible; import nmd.primal.forgecraft.tiles.TileNBTCrucible;
import nmd.primal.forgecraft.util.AnvilHandler; import nmd.primal.forgecraft.util.AnvilHandler;
import org.lwjgl.Sys;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static nmd.primal.forgecraft.blocks.CustomContainerFacing.FACING;
/** /**
* Created by mminaie on 12/30/17. * Created by mminaie on 12/30/17.
*/ */

1
kfc/src/main/java/nmd/primal/forgecraft/items/blocks/AbstractItemBlock.java
View File

@@ -5,7 +5,6 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import nmd.primal.core.api.interfaces.IFireProof;
import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.ModInfo;

4
kfc/src/main/java/nmd/primal/forgecraft/items/blocks/ItemNBTCrucible.java
View File

@@ -3,9 +3,7 @@ package nmd.primal.forgecraft.items.blocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@@ -13,9 +11,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.common.helper.PlayerHelper;
import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.init.ModItems;
import javax.annotation.Nullable; import javax.annotation.Nullable;

2
kfc/src/main/java/nmd/primal/forgecraft/items/parts/ToolPart.java
View File

@@ -1,7 +1,6 @@
package nmd.primal.forgecraft.items.parts; package nmd.primal.forgecraft.items.parts;
import com.mojang.realmsclient.gui.ChatFormatting; import com.mojang.realmsclient.gui.ChatFormatting;
import net.minecraft.block.material.Material;
import net.minecraft.client.util.ITooltipFlag; import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
@@ -19,7 +18,6 @@ import nmd.primal.forgecraft.util.ToolNBT;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
import java.util.StringJoiner;
/** /**
* Created by mminaie on 3/9/17. * Created by mminaie on 3/9/17.

4
kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java
View File

@@ -10,7 +10,7 @@ import net.minecraft.util.*;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; 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.ModInfo;
import nmd.primal.forgecraft.init.ModSounds; import nmd.primal.forgecraft.init.ModSounds;
import nmd.primal.forgecraft.items.BaseItem; import nmd.primal.forgecraft.items.BaseItem;
@@ -51,7 +51,7 @@ public class Musket extends BaseItem{
//if(player.getItemInUseCount() > 5) { //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)); 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.setType("muck");
entity.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, 7.0F, 0.5F); entity.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, 7.0F, 0.5F);
world.spawnEntity(entity); world.spawnEntity(entity);

1
kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java
View File

@@ -17,7 +17,6 @@ import nmd.primal.core.api.PrimalAPI;
import nmd.primal.forgecraft.blocks.Anvil.AnvilBase; import nmd.primal.forgecraft.blocks.Anvil.AnvilBase;
import nmd.primal.forgecraft.blocks.Anvil.AnvilStone; import nmd.primal.forgecraft.blocks.Anvil.AnvilStone;
import nmd.primal.forgecraft.blocks.IngotBall; import nmd.primal.forgecraft.blocks.IngotBall;
import nmd.primal.forgecraft.init.ModBlocks;
import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.init.ModItems;
import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.items.BaseMultiItem;
import nmd.primal.forgecraft.tiles.TileAnvil; import nmd.primal.forgecraft.tiles.TileAnvil;

7
kfc/src/main/java/nmd/primal/forgecraft/tiles/TileAnvil.java
View File

@@ -1,17 +1,10 @@
package nmd.primal.forgecraft.tiles; package nmd.primal.forgecraft.tiles;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.ITickable; import net.minecraft.util.ITickable;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraft.world.World; 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. * Created by mminaie on 3/4/17.

23
kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java
View File

@@ -5,8 +5,6 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.inventory.ItemStackHelper; import net.minecraft.inventory.ItemStackHelper;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ITickable; import net.minecraft.util.ITickable;
@@ -14,17 +12,14 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import nmd.primal.core.api.PrimalAPI; 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.core.common.helper.RecipeHelper;
import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.blocks.BloomeryBase;
import nmd.primal.forgecraft.blocks.Crucibles.Crucible; import nmd.primal.forgecraft.blocks.Crucibles.Crucible;
import nmd.primal.forgecraft.blocks.Crucibles.NBTCrucible; import nmd.primal.forgecraft.blocks.Crucibles.NBTCrucible;
import nmd.primal.forgecraft.crafting.BloomeryCrafting;
import nmd.primal.forgecraft.crafting.CrucibleCrafting; import nmd.primal.forgecraft.crafting.CrucibleCrafting;
import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.init.ModItems;
import static nmd.primal.core.common.helper.FireHelper.makeSmoke;
/** /**
* Created by mminaie on 1/22/17. * Created by mminaie on 1/22/17.
*/ */
@@ -49,15 +44,11 @@ public class TileBloomery extends TileBaseSlot implements ITickable {
this.iteration++; this.iteration++;
if (this.iteration == 100) { if (this.iteration == 100) {
RecipeHelper.fuelManager(world,this, this.getSlotStack(0)); RecipeHelper.fuelManager(world,this, this.getSlotStack(0));
if(CommonUtils.randomCheck(1000)) { FireHelper.makeSmoke(world, pos, 1000);
makeSmoke(world, pos);
}
} }
if (this.iteration == 200) { if (this.iteration == 200) {
RecipeHelper.fuelManager(world, this, this.getSlotStack(0)); RecipeHelper.fuelManager(world, this, this.getSlotStack(0));
if(CommonUtils.randomCheck(1000)) { FireHelper.makeSmoke(world, pos, 1000);
makeSmoke(world, pos);
}
} }
if (this.iteration == 300) { if (this.iteration == 300) {
this.iteration = 0; this.iteration = 0;
@@ -70,9 +61,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable {
} }
this.heatManager(this.getHeat(), state, this.getSlotStack(0), world, pos); this.heatManager(this.getHeat(), state, this.getSlotStack(0), world, pos);
RecipeHelper.fuelManager(world, this, this.getSlotStack(0)); RecipeHelper.fuelManager(world, this, this.getSlotStack(0));
if(CommonUtils.randomCheck(1000)) { FireHelper.makeSmoke(world, pos, 1000);
makeSmoke(world, pos);
}
} }
slotOneManager(); slotOneManager();
} }
@@ -200,9 +189,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable {
this.markDirty(); this.markDirty();
this.updateBlock(); this.updateBlock();
} }
if(CommonUtils.randomCheck(1000)) { FireHelper.makeSmoke(world, pos, 1000);
makeSmoke(world, pos);
}
} }
} }

10
kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java
View File

@@ -10,7 +10,6 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.api.PrimalAPI;
import nmd.primal.core.common.helper.CommonUtils;
import nmd.primal.core.common.helper.RecipeHelper; import nmd.primal.core.common.helper.RecipeHelper;
import nmd.primal.forgecraft.blocks.Forge; import nmd.primal.forgecraft.blocks.Forge;
import nmd.primal.forgecraft.crafting.ForgeCrafting; 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.items.parts.ToolPart;
import nmd.primal.forgecraft.util.ToolNBT; import nmd.primal.forgecraft.util.ToolNBT;
import static nmd.primal.core.api.PrimalAPI.randomCheck;
import static nmd.primal.core.common.helper.FireHelper.makeSmoke; 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) { if (this.iteration == 100) {
RecipeHelper.fuelManager(world, this, this.getSlotStack(0)); RecipeHelper.fuelManager(world, this, this.getSlotStack(0));
if(CommonUtils.randomCheck(1000)) { if(randomCheck(1000)) {
makeSmoke(world, pos); makeSmoke(world, pos);
} }
} }
if (this.iteration == 200) { if (this.iteration == 200) {
RecipeHelper.fuelManager(world, this, this.getSlotStack(0)); RecipeHelper.fuelManager(world, this, this.getSlotStack(0));
if(CommonUtils.randomCheck(1000)) { if(randomCheck(1000)) {
makeSmoke(world, pos); makeSmoke(world, pos);
} }
} }
@@ -66,7 +66,7 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{
world.notifyBlockUpdate(pos, state, state, 2); world.notifyBlockUpdate(pos, state, state, 2);
} }
RecipeHelper.fuelManager(world, this, this.getSlotStack(0)); RecipeHelper.fuelManager(world, this, this.getSlotStack(0));
if(CommonUtils.randomCheck(1000)) { if(randomCheck(1000)) {
makeSmoke(world, pos); makeSmoke(world, pos);
} }
this.heatManager(this.getHeat(), state, this.getSlotStack(0), 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.markDirty();
this.updateBlock(); this.updateBlock();
} }
if(CommonUtils.randomCheck(1000)) { if(randomCheck(1000)) {
makeSmoke(world, pos); makeSmoke(world, pos);
} }
} }

1
kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java
View File

@@ -2,7 +2,6 @@ package nmd.primal.forgecraft.tiles;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.inventory.ItemStackHelper; import net.minecraft.inventory.ItemStackHelper;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ITickable; import net.minecraft.util.ITickable;

5
kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java
View File

@@ -4,20 +4,15 @@ import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; 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.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import nmd.primal.core.api.PrimalAPI;
import nmd.primal.core.common.items.tools.Gallagher; import nmd.primal.core.common.items.tools.Gallagher;
import nmd.primal.forgecraft.CommonUtils; import nmd.primal.forgecraft.CommonUtils;
import nmd.primal.forgecraft.blocks.IngotBall; import nmd.primal.forgecraft.blocks.IngotBall;
import nmd.primal.forgecraft.crafting.AnvilCrafting; import nmd.primal.forgecraft.crafting.AnvilCrafting;
import nmd.primal.forgecraft.init.ModBlocks;
import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.init.ModItems;
import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.items.BaseMultiItem;
import nmd.primal.forgecraft.items.ForgeHammer; import nmd.primal.forgecraft.items.ForgeHammer;

2
kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java
View File

@@ -13,7 +13,7 @@ import nmd.primal.core.common.helper.RecipeHelper;
import nmd.primal.forgecraft.blocks.CustomContainerFacing; import nmd.primal.forgecraft.blocks.CustomContainerFacing;
import nmd.primal.forgecraft.tiles.TileBreaker; 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; //import nmd.primal.forgecraft.CommonUtils;