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

abstract bloomery input

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2017-04-22 14:56:41 -04:00
parent b4689906b7
commit 2539ca1883
7 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
1.11/To-Dos
View File

@@ -4,10 +4,7 @@ To-Dos
*** Priority ***
- [ ] StoneTongs for all tool heads
- [x] ItemNBT
- [ ] ItemRender
- [ ] JSON
- [ ] Bloomery not accepting raw clean crucible
- [ ] Move Ingot break into chunks logic out of the block and into the ForgeHammer
- [ ] Add Yew
@@ -41,6 +38,10 @@ rm *.json--
rename s/iron/steel/ iron*
*** Completed ***
- [x] StoneTongs for all tool heads
- [x] ItemNBT
- [x] ItemRender
- [x] JSON
- [x] Change how bloomery does recipe cookTime
- [x] Duplication Bug for Tool Repair
- [x] Fix Breaker Render to rotate correctly

5
1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java
View File

@@ -121,7 +121,10 @@ public class Bloomery extends CustomContainerFacing implements ITileEntityProvid
}
}
if(tile.getSlotStack(0) != ItemStack.EMPTY) {
if((pItem.getItem() == Items.FLINT_AND_STEEL) || (pItem.getItem() == PrimalItems.FIRE_BOW) || pItem.getItem() == PrimalItems.TORCH_WOOD_LIT || pItem.getItem() == PrimalItems.TORCH_NETHER_LIT ) {
if((pItem.getItem() == Items.FLINT_AND_STEEL) ||
(pItem.getItem() == PrimalItems.FIRE_BOW) ||
pItem.getItem() == PrimalItems.TORCH_WOOD_LIT ||
pItem.getItem() == PrimalItems.TORCH_NETHER_LIT ) {
world.setBlockState(pos, state.withProperty(ACTIVE, true), 2);
tile.setHeat(100);
tile.markDirty();

18
1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java
View File

@@ -334,15 +334,15 @@ public class ModBlocks {
) {
player.swingArm(hand);
world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
tile.setSlotStack(6, new ItemStack(ModItems.ironchunkhot, 1));
tile.setSlotStack(7, new ItemStack(ModItems.ironchunkhot, 1));
tile.setSlotStack(8, new ItemStack(ModItems.ironchunkhot, 1));
tile.setSlotStack(11, new ItemStack(ModItems.ironchunkhot, 1));
tile.setSlotStack(12, new ItemStack(ModItems.ironchunkhot, 1));
tile.setSlotStack(13, new ItemStack(ModItems.ironchunkhot, 1));
tile.setSlotStack(16, new ItemStack(ModItems.ironchunkhot, 1));
tile.setSlotStack(17, new ItemStack(ModItems.ironchunkhot, 1));
tile.setSlotStack(18, new ItemStack(ModItems.ironchunkhot, 1));
tile.setSlotStack(6, new ItemStack(ModItems.wootzchunkhot, 1));
tile.setSlotStack(7, new ItemStack(ModItems.wootzchunkhot, 1));
tile.setSlotStack(8, new ItemStack(ModItems.wootzchunkhot, 1));
tile.setSlotStack(11, new ItemStack(ModItems.wootzchunkhot, 1));
tile.setSlotStack(12, new ItemStack(ModItems.wootzchunkhot, 1));
tile.setSlotStack(13, new ItemStack(ModItems.wootzchunkhot, 1));
tile.setSlotStack(16, new ItemStack(ModItems.wootzchunkhot, 1));
tile.setSlotStack(17, new ItemStack(ModItems.wootzchunkhot, 1));
tile.setSlotStack(18, new ItemStack(ModItems.wootzchunkhot, 1));
world.playEvent(1031, pos, 0);
return true;
}

6
1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java
View File

@@ -187,6 +187,12 @@ public class ModItems {
GameRegistry.register(forgehammer);
GameRegistry.register(ironingotballhot);
GameRegistry.register(ironchunkhot);
GameRegistry.register(ironcleaningotballhot);
GameRegistry.register(ironcleanchunkhot);
GameRegistry.register(steelingotballhot);
GameRegistry.register(steelchunkhot);
GameRegistry.register(wootzingotballhot);
GameRegistry.register(wootzchunkhot);
//GameRegistry.register(test);
/**********

9
1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java
View File

@@ -21,6 +21,7 @@ import nmd.primal.forgecraft.blocks.Anvil;
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;
import nmd.primal.forgecraft.tiles.TileBloomery;
import org.lwjgl.opengl.GL11;
@@ -151,7 +152,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
GL11.glPopMatrix();
}
if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot || tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot){
if(tile.getSlotStack(counter).getItem() instanceof BaseMultiItem){
GL11.glPushMatrix();
double scale = 1.0D;
GL11.glScaled(scale, scale, scale);
@@ -228,7 +229,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
GL11.glPopMatrix();
}
if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot || tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot){
if(tile.getSlotStack(counter).getItem() instanceof BaseMultiItem){
GL11.glPushMatrix();
double scale = 1.0D;
GL11.glScaled(scale, scale, scale);
@@ -307,7 +308,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
GL11.glPopMatrix();
}
if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot || tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot){
if(tile.getSlotStack(counter).getItem() instanceof BaseMultiItem){
GL11.glPushMatrix();
double scale = 1.0D;
GL11.glScaled(scale, scale, scale);
@@ -387,7 +388,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
GL11.glPopMatrix();
}
if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot || tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot){
if(tile.getSlotStack(counter).getItem() instanceof BaseMultiItem){
GL11.glPushMatrix();
double scale = 1.0D;
GL11.glScaled(scale, scale, scale);

4
1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java
View File

@@ -1,5 +1,6 @@
package nmd.primal.forgecraft.tiles;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@@ -10,6 +11,7 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import nmd.primal.forgecraft.blocks.Bloomery;
import nmd.primal.forgecraft.blocks.Crucible;
import nmd.primal.forgecraft.blocks.Forge;
import nmd.primal.forgecraft.crafting.BloomeryCrafting;
import nmd.primal.forgecraft.init.ModBlocks;
@@ -177,7 +179,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable {
if (stack.getItem() == ModItems.softcrucible) {
return true;
}
if(stack.getItem() == Item.getItemFromBlock(ModBlocks.rawironcrucible)){
if(Block.getBlockFromItem(stack.getItem()) instanceof Crucible ){
return true;
}
}

2
1.11/src/main/resources/assets/forgecraft/models/item/ironcleaningotballhot.json
View File

@@ -4,5 +4,5 @@
"particle": "forgecraft:blocks/clean_iron_ingot_hot",
"texture": "forgecraft:blocks/clean_iron_ingot_hot"
},
"parent": "forgecraft:block/ironchunk"
"parent": "forgecraft:item/ironball"
}