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

fixed merge conflict from master

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2018-10-27 16:26:09 -04:00
parent 51561d063e 94ed0367aa
commit 25ba3af7c6
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kfc/To-Dos.md
View File

@@ -1,11 +1,11 @@
# To-Dos
## Bugs
- [ ] Placement bug for crucible from tongs
- [ ] Wootz shovel not rendering (NORTH)
- [ ] Damascus Rendering in tongs
- [ ] bug for recipe with damascus shovel
- [ ] redstone 1 is ok redstone 2 is not ok
## Current Feature
- [ ] weapon upgrades

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

@@ -1851,7 +1851,7 @@ public class ModCrafting{
AnvilCrafting.addRecipe(
new ItemStack [] {
emptyAir,emptyAir,emptyAir,emptyAir,emptyAir,
emptyAir,emptyAir,hotSteelChunk,emptyAir,emptyAir,
emptyAir,emptyAir,hotWootzChunk,emptyAir,emptyAir,
emptyAir,emptyAir,wootzshovelhead,emptyAir,emptyAir,
emptyAir,emptyAir,emptyAir,emptyAir,emptyAir,
emptyAir,emptyAir,emptyAir,emptyAir,emptyAir },

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

@@ -129,7 +129,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
if (item.equals(ModItems.ironshovelhead) ||
item.equals(ModItems.cleanironshovelhead) ||
item.equals(ModItems.steelshovelhead) ||
item.equals(ModItems.steelshovelhead)
item.equals(ModItems.wootzshovelhead)
) {
GL11.glPushMatrix();
double scale = 1.0D;
@@ -143,7 +143,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
if (item.equals(ModItems.ironhoehead) ||
item.equals(ModItems.cleanironhoehead) ||
item.equals(ModItems.steelhoehead) ||
item.equals(ModItems.steelhoehead)
item.equals(ModItems.wootzhoehead)
) {
GL11.glPushMatrix();
double scale = 1.0D;
@@ -215,7 +215,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
if (item.equals(ModItems.ironshovelhead) ||
item.equals(ModItems.cleanironshovelhead) ||
item.equals(ModItems.steelshovelhead) ||
item.equals(ModItems.steelshovelhead)
item.equals(ModItems.wootzshovelhead)
) {
GL11.glPushMatrix();
double scale = 1.0D;
@@ -302,7 +302,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
if (item.equals(ModItems.ironshovelhead) ||
item.equals(ModItems.cleanironshovelhead) ||
item.equals(ModItems.steelshovelhead) ||
item.equals(ModItems.steelshovelhead)
item.equals(ModItems.wootzshovelhead)
) {
GL11.glPushMatrix();
double scale = 1.0D;
@@ -312,7 +312,10 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
GL11.glPopMatrix();
}
if (item.equals(ModItems.ironhoehead)) {
if (item.equals(ModItems.ironhoehead) ||
item.equals(ModItems.cleanironhoehead) ||
item.equals(ModItems.steelhoehead) ||
item.equals(ModItems.wootzhoehead) ){
GL11.glPushMatrix();
double scale = 1.0D;
GL11.glScaled(scale, scale, scale);
@@ -386,7 +389,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
if (item.equals(ModItems.ironshovelhead) ||
item.equals(ModItems.cleanironshovelhead) ||
item.equals(ModItems.steelshovelhead) ||
item.equals(ModItems.steelshovelhead)
item.equals(ModItems.wootzshovelhead)
) {
GL11.glPushMatrix();
double scale = 1.0D;
@@ -396,7 +399,10 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
GL11.glPopMatrix();
}
if (item.equals(ModItems.ironhoehead)) {
if (item.equals(ModItems.ironhoehead) ||
item.equals(ModItems.cleanironhoehead) ||
item.equals(ModItems.steelhoehead) ||
item.equals(ModItems.wootzhoehead) ){
GL11.glPushMatrix();
double scale = 1.0D;
GL11.glScaled(scale, scale, scale);

BIN
kfc/src/main/resources/assets/forgecraft/textures/items/wootz/0.032.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB