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

upgrade textures all added, pickaxehead variants all added

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2017-03-14 01:21:47 -04:00
parent a561faadfc
commit 6505c797a0
53 changed files with 221 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
1.11/To-Dos
View File

@@ -1,5 +1,22 @@
To-Dos
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_emerald1_diamond1"
}
}
ironpickaxehead_1
*** Priority ***
- [ ] Create all the textures for all the NBT types
@@ -13,7 +30,7 @@ To-Dos
*** Backlog ***
- [ ] Create a method which adds the types of NBT upgrades and creates a unique float instead of using magic numbers
- [ ] Add forgehammer to oreDict
- [ ] Finish Toolhead Recipes
- [ ] WeaponHead recipes

34
1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/PickaxePart.java
View File

@@ -22,7 +22,8 @@ public class PickaxePart extends ToolPart {
/***
Hot . Emerald . Diamond . Redstone . lapis
hot . emerald . diamond . redstone . lapis
0 . 0 . 0 . 0 . 0
***/
@@ -35,15 +36,7 @@ public class PickaxePart extends ToolPart {
public float apply(ItemStack item, @Nullable World worldIn, @Nullable EntityLivingBase entityIn)
{
if (item.hasTagCompound()) {
if (item.getSubCompound("tags").getBoolean("hot") == true) {
return 1.0F;
}
if (item.getSubCompound("tags").getBoolean("hot") == false) {
if (item.getSubCompound("tags").getInteger("modifiers") == 0) {
return 0.0F;
}
}
if (item.getSubCompound("tags").getBoolean("hot") == false) {
if (item.getSubCompound("tags").getInteger("modifiers") != 0) {
@@ -105,6 +98,8 @@ public class PickaxePart extends ToolPart {
return 0.03F;
}
//=======
if ((item.getSubCompound("tags").getBoolean("emerald") == false) &&
(item.getSubCompound("tags").getInteger("diamond") == 0) &&
(item.getSubCompound("tags").getInteger("redstone") == 1) &&
@@ -126,6 +121,8 @@ public class PickaxePart extends ToolPart {
return 0.003F;
}
//=========
if ((item.getSubCompound("tags").getBoolean("emerald") == false) &&
(item.getSubCompound("tags").getInteger("diamond") == 0) &&
(item.getSubCompound("tags").getInteger("redstone") == 0) &&
@@ -147,6 +144,8 @@ public class PickaxePart extends ToolPart {
return 0.0003F;
}
//=======
if ((item.getSubCompound("tags").getBoolean("emerald") == false) &&
(item.getSubCompound("tags").getInteger("diamond") == 1) &&
(item.getSubCompound("tags").getInteger("redstone") == 1) &&
@@ -172,14 +171,14 @@ public class PickaxePart extends ToolPart {
(item.getSubCompound("tags").getInteger("diamond") == 0) &&
(item.getSubCompound("tags").getInteger("redstone") == 1) &&
(item.getSubCompound("tags").getInteger("lapis") == 2)) {
return 0.012F;
return 0.0012F;
}
if ((item.getSubCompound("tags").getBoolean("emerald") == false) &&
(item.getSubCompound("tags").getInteger("diamond") == 0) &&
(item.getSubCompound("tags").getInteger("redstone") == 1) &&
(item.getSubCompound("tags").getInteger("lapis") == 2)) {
return 0.0012F;
(item.getSubCompound("tags").getInteger("redstone") == 2) &&
(item.getSubCompound("tags").getInteger("lapis") == 1)) {
return 0.0021F;
}
if ((item.getSubCompound("tags").getBoolean("emerald") == false) &&
@@ -190,6 +189,15 @@ public class PickaxePart extends ToolPart {
}
}
}
if (item.getSubCompound("tags").getBoolean("hot") == true) {
return 1.0F;
}
if (item.getSubCompound("tags").getBoolean("hot") == false) {
if (item.getSubCompound("tags").getInteger("modifiers") == 0) {
return 0.0F;
}
}
}
return 0.0F;
}

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

@@ -141,8 +141,12 @@ public class TileForge extends TileBaseSlot implements ITickable {
}
if (cookCounter4 >= recipe.getIdealTime()) {
if(this.getSlotStack(i).hasTagCompound()){
if( this.getSlotStack(i).getSubCompound("tags").getBoolean("hot") == false) {
this.getSlotStack(i).getSubCompound("tags").setBoolean("hot", true);
System.out.println(this.getSlotStack(i).getSubCompound("tags"));
System.out.println("its hot now");
cookCounter4 = 0;
}
} else this.setSlotStack(i, recipe.getOutput());
cookCounter4 = 0;
}

24
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead.json
View File

@@ -7,8 +7,28 @@
},
"overrides": [
{"predicate": {"type": 0.0},"model": "forgecraft:item/ironpickaxehead_0"},
{"predicate": {"type": 1.0},"model": "forgecraft:item/ironpickaxehead_1"},
{"predicate": {"type": 0.1},"model": "forgecraft:item/ironpickaxehead_2"}
{"predicate": {"type": 0.0001},"model": "forgecraft:item/ironpickaxehead_13"},
{"predicate": {"type": 0.0002},"model": "forgecraft:item/ironpickaxehead_14"},
{"predicate": {"type": 0.0003},"model": "forgecraft:item/ironpickaxehead_15"},
{"predicate": {"type": 0.001},"model": "forgecraft:item/ironpickaxehead_10"},
{"predicate": {"type": 0.0012},"model": "forgecraft:item/ironpickaxehead_19"},
{"predicate": {"type": 0.002},"model": "forgecraft:item/ironpickaxehead_11"},
{"predicate": {"type": 0.0021},"model": "forgecraft:item/ironpickaxehead_20"},
{"predicate": {"type": 0.003},"model": "forgecraft:item/ironpickaxehead_12"},
{"predicate": {"type": 0.01},"model": "forgecraft:item/ironpickaxehead_7"},
{"predicate": {"type": 0.0102},"model": "forgecraft:item/ironpickaxehead_21"},
{"predicate": {"type": 0.0111},"model": "forgecraft:item/ironpickaxehead_16"},
{"predicate": {"type": 0.012},"model": "forgecraft:item/ironpickaxehead_18"},
{"predicate": {"type": 0.02},"model": "forgecraft:item/ironpickaxehead_8"},
{"predicate": {"type": 0.021},"model": "forgecraft:item/ironpickaxehead_17"},
{"predicate": {"type": 0.03},"model": "forgecraft:item/ironpickaxehead_9"},
{"predicate": {"type": 0.1},"model": "forgecraft:item/ironpickaxehead_2"},
{"predicate": {"type": 0.102},"model": "forgecraft:item/ironpickaxehead_6"},
{"predicate": {"type": 0.11},"model": "forgecraft:item/ironpickaxehead_3"},
{"predicate": {"type": 0.111},"model": "forgecraft:item/ironpickaxehead_5"},
{"predicate": {"type": 0.12},"model": "forgecraft:item/ironpickaxehead_4"},
{"predicate": {"type": 1.0},"model": "forgecraft:item/ironpickaxehead_1"}
]
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_10.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_redstone1"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_11.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_redstone2"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_12.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_redstone3"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_13.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_lapis1"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_14.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_lapis2"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_15.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_lapis3"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_16.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_diamond1_redstone1_lapis1"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_17.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_diamond2_redstone1"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_18.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_diamond1_redstone2"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_19.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_redstone1_lapis2"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_20.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_redstone2_lapis1"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_21.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_diamond1_lapis2"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_3.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_emerald1_diamond1"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_4.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_emerald1_diamond2"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_5.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_emerald1_diamond1_redstone1"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_6.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_emerald1_redstone2"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_7.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_diamond1"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_8.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_diamond2"
}
}

8
1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_9.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "forgecraft:item/pickaxehead",
"textures": {
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:items/iron_ingot_diamond3"
}
}

4
1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead.json
View File

@@ -1,9 +1,9 @@
{
"__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio",
"textures": {
"particle": "forgecraft:blocks/iron_ingot",
"particle": "forgecraft:items/iron_ingot",
"texture": "blocks/planks_oak",
"texture1": "forgecraft:blocks/iron_ingot"
"texture1": "forgecraft:items/iron_ingot"
},
"elements": [
{

BIN
1.11/src/main/resources/assets/forgecraft/textures/diamondLayer1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 181 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/diamondLayer2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 216 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/diamondLayer3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 234 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 828 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1_lapis2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 934 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1_redstone1_lapis1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 922 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1_redstone2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 892 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 868 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond2_redstone1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 909 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 915 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 912 B

After

Width:  |  Height:  |  Size: 977 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_diamond1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1013 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_diamond1_redstone1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1017 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_diamond2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1019 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_redstone2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 997 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_lapis1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 840 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_lapis2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_lapis3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 942 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 809 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone1_lapis2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 930 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 848 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone2_lapis1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 899 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 914 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/lapisLayer1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 176 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/lapisLayer2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 218 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/lapisLayer3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 252 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/redstoneLayer1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 237 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/redstoneLayer2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 277 B

BIN
1.11/src/main/resources/assets/forgecraft/textures/redstoneLayer3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 312 B