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

ready to start CT support. Need to make sure tongs models are still good

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2018-08-31 08:13:55 -04:00
parent d8256951d4
commit 84992ccdc1
23 changed files with 165 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider {
ItemStack pItem = player.inventory.getCurrentItem();
ItemStack pItem1 = new ItemStack(pItem.getItem(), 1);
System.out.println(tile.getStatus());
//System.out.println(tile.getStatus());
/**PICKS UP THE CRUCIBLE**/
if (player.isSneaking() == false) {
if (pItem.isEmpty()) {
@@ -77,7 +77,7 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider {
}
/**SET INGREDIENT ARRAY FOR THE CRUCIBLE NOW**/
if (player.isSneaking() == false) {
if (!player.isSneaking()) {
if (!pItem.isEmpty()) {
if (pItem.getItem() instanceof SlottedTongs) {
return false;
@@ -88,7 +88,6 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider {
pItem.shrink(1);
tile.setHot(i);
world.setBlockState(pos, state.withProperty(PrimalAPI.States.LAYERS, i), 2);
System.out.println(i);
tile.update();
tile.markDirty();
return true;

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

@@ -86,8 +86,6 @@ public class ModCrafting{
100,
1000);
//TODO BRONZE RECIPE
CrucibleCrafting.addRecipe(
new OreIngredient("dustCopper"),
new OreIngredient("dustCopper"),

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

@@ -36,31 +36,31 @@ public class ItemNBTCrucible extends ItemBlock {
return 0.0f;
}
if (getHot(item) == 1){
return 0.1f;
return 0.01f;
}
if (getHot(item) == 2){
return 0.2f;
return 0.02f;
}
if (getHot(item) == 3){
return 0.3f;
return 0.03f;
}
if (getHot(item) == 4){
return 0.4f;
return 0.04f;
}
if (getHot(item) == 5){
return 0.5f;
return 0.05f;
}
if (getHot(item) == 6){
return 0.6f;
return 0.06f;
}
if (getHot(item) == 7){
return 0.7f;
return 0.07f;
}
if (getHot(item) == 8){
return 0.8f;
return 0.08f;
}
if (getHot(item) == 9){
return 0.9f;
return 0.09f;
}
if (getHot(item) == 10){
return 0.10f;
@@ -79,6 +79,8 @@ public class ItemNBTCrucible extends ItemBlock {
}
if (getHot(item) == 15){
return 0.15f;
} else {
return 0.0f;
}
}
return 0.0F;

16
kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json
View File

@@ -22,7 +22,8 @@
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand"
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
},
"model": "forgecraft:castingcrucible2"
},
@@ -30,7 +31,8 @@
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand"
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
},
"model": "forgecraft:castingcrucible3"
},
@@ -38,7 +40,8 @@
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand"
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
},
"model": "forgecraft:castingcrucible4"
},
@@ -46,14 +49,15 @@
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand"
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
},
"model": "forgecraft:castingcrucible5"
},
"6": {
"textures": {
"particle": "forgecraft:blocks/stone_slab_hot",
"texture": "forgecraft:blocks/stone_slab_hot",
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/crucible_cooked"
},
"model": "forgecraft:castingcrucible"

2
kfc/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json
View File

@@ -3,7 +3,7 @@
"textures": {
"particle": "blocks/stone_slab",
"texture": "blocks/stone_slab",
"texture1": "primal:items/adobebrick_dry",
"texture1": "primal:items/bricks/adobebrick_dry",
"texture2": "primal:blocks/adobebrick_mortar"
},
"elements": [

2
kfc/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json
View File

@@ -3,7 +3,7 @@
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "primal:blocks/adobebrick",
"texture1": "primal:items/bricks/adobebrick_dry",
"texture2": "primal:blocks/adobebrick_mortar",
"texture3": "forgecraft:blocks/adobebrick_lit"
},

16
kfc/src/main/resources/assets/forgecraft/models/item/itemnbtcrucible.json
View File

@@ -6,7 +6,21 @@
},
"overrides": [
{"predicate": {"type": 0.0},"model": "forgecraft:item/nbtcrucible/nbtcrucible_0"},
{"predicate": {"type": 0.1},"model": "forgecraft:item/nbtcrucible/nbtcrucible_1"}
{"predicate": {"type": 0.01},"model": "forgecraft:item/nbtcrucible/nbtcrucible_01"},
{"predicate": {"type": 0.02},"model": "forgecraft:item/nbtcrucible/nbtcrucible_02"},
{"predicate": {"type": 0.03},"model": "forgecraft:item/nbtcrucible/nbtcrucible_03"},
{"predicate": {"type": 0.04},"model": "forgecraft:item/nbtcrucible/nbtcrucible_04"},
{"predicate": {"type": 0.05},"model": "forgecraft:item/nbtcrucible/nbtcrucible_05"},
{"predicate": {"type": 0.06},"model": "forgecraft:item/nbtcrucible/nbtcrucible_06"},
{"predicate": {"type": 0.07},"model": "forgecraft:item/nbtcrucible/nbtcrucible_07"},
{"predicate": {"type": 0.08},"model": "forgecraft:item/nbtcrucible/nbtcrucible_08"},
{"predicate": {"type": 0.09},"model": "forgecraft:item/nbtcrucible/nbtcrucible_09"},
{"predicate": {"type": 0.10},"model": "forgecraft:item/nbtcrucible/nbtcrucible_10"},
{"predicate": {"type": 0.11},"model": "forgecraft:item/nbtcrucible/nbtcrucible_11"},
{"predicate": {"type": 0.12},"model": "forgecraft:item/nbtcrucible/nbtcrucible_12"},
{"predicate": {"type": 0.13},"model": "forgecraft:item/nbtcrucible/nbtcrucible_13"},
{"predicate": {"type": 0.14},"model": "forgecraft:item/nbtcrucible/nbtcrucible_14"},
{"predicate": {"type": 0.15},"model": "forgecraft:item/nbtcrucible/nbtcrucible_15"}
]
}

2
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_0.json
View File

@@ -1,5 +1,5 @@
{
"parent": "forgecraft:emptycrucible",
"parent": "forgecraft:block/emptycrucible",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab"

0
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_1.json → kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_01.json
View File

9
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_02.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "forgecraft:block/castingcrucible2",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
}
}

9
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_03.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "forgecraft:block/castingcrucible3",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
}
}

9
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_04.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "forgecraft:block/castingcrucible4",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
}
}

9
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_05.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "forgecraft:block/castingcrucible5",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
}
}

8
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_06.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:block/castingcrucible",
"textures": {
"particle": "forgecraft:blocks/stone_slab_hot",
"texture": "forgecraft:blocks/stone_slab_hot",
"texture1": "forgecraft:items/hot_bronze"
}
}

9
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_07.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "forgecraft:block/castingcrucible1",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
}
}

9
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_08.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "forgecraft:block/castingcrucible1",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
}
}

9
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_09.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "forgecraft:block/castingcrucible1",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
}
}

9
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_10.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "forgecraft:block/castingcrucible1",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
}
}

9
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_11.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "forgecraft:block/castingcrucible1",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
}
}

9
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_12.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "forgecraft:block/castingcrucible1",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
}
}

9
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_13.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "forgecraft:block/castingcrucible1",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
}
}

9
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_14.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "forgecraft:block/castingcrucible1",
"textures": {
"particle": "forgecraft:blocks/stone_slab",
"texture": "forgecraft:blocks/stone_slab",
"texture1": "forgecraft:blocks/dirty_sand",
"texture3": "forgecraft:blocks/dirty_sand"
}
}

8
kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_15.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:castingcrucible",
"textures": {
"particle": "forgecraft:blocks/stone_slab_hot",
"texture": "forgecraft:blocks/stone_slab_hot",
"texture1": "forgecraft:items/hot_bronze"
}
}