From 2bce47b2dc71572ad8f40f6f947624d74197b48c Mon Sep 17 00:00:00 2001 From: Wurmatron Date: Thu, 22 Jun 2017 20:28:59 -0400 Subject: [PATCH] FixedTextures Not Loading in 1.11.2 --- gradle.properties | 2 +- .../viral/blockstates/torchInterdiction.json | 22 --------- .../torchInterdictionInverted.json | 22 --------- .../viral/blockstates/torchinterdiction.json | 22 +++++++++ .../torchinterdictioninverted.json | 22 +++++++++ ...terdiction.json => torchinterdiction.json} | 4 +- ..._side.json => torchinterdiction_side.json} | 2 +- .../{syringeCure.json => syringecure.json} | 4 +- .../{syringeFilled.json => syringeempty.json} | 4 +- ...yringeImmunity.json => syringefilled.json} | 4 +- ...syringeEmpty.json => syringeimmunity.json} | 4 +- .../viral/models/item/torchInterdiction.json | 42 ------------------ .../item/torchInterdictionInverted.json | 42 ------------------ .../viral/models/item/torchinterdiction.json | 42 ++++++++++++++++++ .../item/torchinterdictioninverted.json | 42 ++++++++++++++++++ ...Interdiction.png => torchinterdiction.png} | Bin .../{syringeCure.png => syringecure.png} | Bin .../{syringeEmpty.png => syringeempty.png} | Bin .../{syringeFilled.png => syringefilled.png} | Bin ...yringeImmunity.png => syringeimmunity.png} | Bin 20 files changed, 140 insertions(+), 140 deletions(-) delete mode 100644 src/main/resources/assets/viral/blockstates/torchInterdiction.json delete mode 100644 src/main/resources/assets/viral/blockstates/torchInterdictionInverted.json create mode 100644 src/main/resources/assets/viral/blockstates/torchinterdiction.json create mode 100644 src/main/resources/assets/viral/blockstates/torchinterdictioninverted.json rename src/main/resources/assets/viral/models/block/{torchInterdiction.json => torchinterdiction.json} (96%) rename src/main/resources/assets/viral/models/block/{torchInterdiction_side.json => torchinterdiction_side.json} (97%) rename src/main/resources/assets/viral/models/item/{syringeCure.json => syringecure.json} (92%) rename src/main/resources/assets/viral/models/item/{syringeFilled.json => syringeempty.json} (92%) rename src/main/resources/assets/viral/models/item/{syringeImmunity.json => syringefilled.json} (92%) rename src/main/resources/assets/viral/models/item/{syringeEmpty.json => syringeimmunity.json} (92%) delete mode 100644 src/main/resources/assets/viral/models/item/torchInterdiction.json delete mode 100644 src/main/resources/assets/viral/models/item/torchInterdictionInverted.json create mode 100644 src/main/resources/assets/viral/models/item/torchinterdiction.json create mode 100644 src/main/resources/assets/viral/models/item/torchinterdictioninverted.json rename src/main/resources/assets/viral/textures/blocks/{torchInterdiction.png => torchinterdiction.png} (100%) rename src/main/resources/assets/viral/textures/items/{syringeCure.png => syringecure.png} (100%) rename src/main/resources/assets/viral/textures/items/{syringeEmpty.png => syringeempty.png} (100%) rename src/main/resources/assets/viral/textures/items/{syringeFilled.png => syringefilled.png} (100%) rename src/main/resources/assets/viral/textures/items/{syringeImmunity.png => syringeimmunity.png} (100%) diff --git a/gradle.properties b/gradle.properties index a646f87..4e2b766 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=Viral package_group=wurmatron -mod_version=0.1.0 +mod_version=0.1.1 mc_version=1.11.2 forge_version=latest diff --git a/src/main/resources/assets/viral/blockstates/torchInterdiction.json b/src/main/resources/assets/viral/blockstates/torchInterdiction.json deleted file mode 100644 index df4dcf7..0000000 --- a/src/main/resources/assets/viral/blockstates/torchInterdiction.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "facing=up": { - "model": "viral:torchInterdiction" - }, - "facing=east": { - "model": "viral:torchInterdiction_side" - }, - "facing=south": { - "model": "viral:torchInterdiction_side", - "y": 90 - }, - "facing=west": { - "model": "viral:torchInterdiction_side", - "y": 180 - }, - "facing=north": { - "model": "viral:torchInterdiction_side", - "y": 270 - } - } -} diff --git a/src/main/resources/assets/viral/blockstates/torchInterdictionInverted.json b/src/main/resources/assets/viral/blockstates/torchInterdictionInverted.json deleted file mode 100644 index df4dcf7..0000000 --- a/src/main/resources/assets/viral/blockstates/torchInterdictionInverted.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "facing=up": { - "model": "viral:torchInterdiction" - }, - "facing=east": { - "model": "viral:torchInterdiction_side" - }, - "facing=south": { - "model": "viral:torchInterdiction_side", - "y": 90 - }, - "facing=west": { - "model": "viral:torchInterdiction_side", - "y": 180 - }, - "facing=north": { - "model": "viral:torchInterdiction_side", - "y": 270 - } - } -} diff --git a/src/main/resources/assets/viral/blockstates/torchinterdiction.json b/src/main/resources/assets/viral/blockstates/torchinterdiction.json new file mode 100644 index 0000000..d3b268a --- /dev/null +++ b/src/main/resources/assets/viral/blockstates/torchinterdiction.json @@ -0,0 +1,22 @@ +{ + "variants": { + "facing=up": { + "model": "viral:torchinterdiction" + }, + "facing=east": { + "model": "viral:torchinterdiction_side" + }, + "facing=south": { + "model": "viral:torchinterdiction_side", + "y": 90 + }, + "facing=west": { + "model": "viral:torchinterdiction_side", + "y": 180 + }, + "facing=north": { + "model": "viral:torchinterdiction_side", + "y": 270 + } + } +} diff --git a/src/main/resources/assets/viral/blockstates/torchinterdictioninverted.json b/src/main/resources/assets/viral/blockstates/torchinterdictioninverted.json new file mode 100644 index 0000000..d3b268a --- /dev/null +++ b/src/main/resources/assets/viral/blockstates/torchinterdictioninverted.json @@ -0,0 +1,22 @@ +{ + "variants": { + "facing=up": { + "model": "viral:torchinterdiction" + }, + "facing=east": { + "model": "viral:torchinterdiction_side" + }, + "facing=south": { + "model": "viral:torchinterdiction_side", + "y": 90 + }, + "facing=west": { + "model": "viral:torchinterdiction_side", + "y": 180 + }, + "facing=north": { + "model": "viral:torchinterdiction_side", + "y": 270 + } + } +} diff --git a/src/main/resources/assets/viral/models/block/torchInterdiction.json b/src/main/resources/assets/viral/models/block/torchinterdiction.json similarity index 96% rename from src/main/resources/assets/viral/models/block/torchInterdiction.json rename to src/main/resources/assets/viral/models/block/torchinterdiction.json index 2b0bd0b..400df84 100644 --- a/src/main/resources/assets/viral/models/block/torchInterdiction.json +++ b/src/main/resources/assets/viral/models/block/torchinterdiction.json @@ -1,7 +1,7 @@ { "ambientocclusion": false, "textures": { - "torch": "viral:blocks/torchInterdiction" + "torch": "viral:blocks/torchinterdiction" }, "elements": [ { @@ -104,4 +104,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/viral/models/block/torchInterdiction_side.json b/src/main/resources/assets/viral/models/block/torchinterdiction_side.json similarity index 97% rename from src/main/resources/assets/viral/models/block/torchInterdiction_side.json rename to src/main/resources/assets/viral/models/block/torchinterdiction_side.json index f39cf25..99d8ff6 100644 --- a/src/main/resources/assets/viral/models/block/torchInterdiction_side.json +++ b/src/main/resources/assets/viral/models/block/torchinterdiction_side.json @@ -1,7 +1,7 @@ { "ambientocclusion": false, "textures": { - "torch": "viral:blocks/torchInterdiction" + "torch": "viral:blocks/torchinterdiction" }, "elements": [ { diff --git a/src/main/resources/assets/viral/models/item/syringeCure.json b/src/main/resources/assets/viral/models/item/syringecure.json similarity index 92% rename from src/main/resources/assets/viral/models/item/syringeCure.json rename to src/main/resources/assets/viral/models/item/syringecure.json index 137b7c3..2436fce 100644 --- a/src/main/resources/assets/viral/models/item/syringeCure.json +++ b/src/main/resources/assets/viral/models/item/syringecure.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "viral:items/syringeCure" + "layer0": "viral:items/syringecure" }, "display": { "thirdperson": { @@ -39,4 +39,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/viral/models/item/syringeFilled.json b/src/main/resources/assets/viral/models/item/syringeempty.json similarity index 92% rename from src/main/resources/assets/viral/models/item/syringeFilled.json rename to src/main/resources/assets/viral/models/item/syringeempty.json index c2727c3..1c63710 100644 --- a/src/main/resources/assets/viral/models/item/syringeFilled.json +++ b/src/main/resources/assets/viral/models/item/syringeempty.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "viral:items/syringeFilled" + "layer0": "viral:items/syringeempty" }, "display": { "thirdperson": { @@ -39,4 +39,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/viral/models/item/syringeImmunity.json b/src/main/resources/assets/viral/models/item/syringefilled.json similarity index 92% rename from src/main/resources/assets/viral/models/item/syringeImmunity.json rename to src/main/resources/assets/viral/models/item/syringefilled.json index c2727c3..060b554 100644 --- a/src/main/resources/assets/viral/models/item/syringeImmunity.json +++ b/src/main/resources/assets/viral/models/item/syringefilled.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "viral:items/syringeFilled" + "layer0": "viral:items/syringefilled" }, "display": { "thirdperson": { @@ -39,4 +39,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/viral/models/item/syringeEmpty.json b/src/main/resources/assets/viral/models/item/syringeimmunity.json similarity index 92% rename from src/main/resources/assets/viral/models/item/syringeEmpty.json rename to src/main/resources/assets/viral/models/item/syringeimmunity.json index 3d654ea..060b554 100644 --- a/src/main/resources/assets/viral/models/item/syringeEmpty.json +++ b/src/main/resources/assets/viral/models/item/syringeimmunity.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "viral:items/syringeEmpty" + "layer0": "viral:items/syringefilled" }, "display": { "thirdperson": { @@ -39,4 +39,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/viral/models/item/torchInterdiction.json b/src/main/resources/assets/viral/models/item/torchInterdiction.json deleted file mode 100644 index a4472d7..0000000 --- a/src/main/resources/assets/viral/models/item/torchInterdiction.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "viral:blocks/torchInterdiction" - }, - "display": { - "thirdperson": { - "rotation": [ - -90, - 0, - 0 - ], - "translation": [ - 0, - 1, - -3 - ], - "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, - "firstperson": { - "rotation": [ - 0, - -135, - 25 - ], - "translation": [ - 0, - 4, - 2 - ], - "scale": [ - 1.7, - 1.7, - 1.7 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/viral/models/item/torchInterdictionInverted.json b/src/main/resources/assets/viral/models/item/torchInterdictionInverted.json deleted file mode 100644 index a4472d7..0000000 --- a/src/main/resources/assets/viral/models/item/torchInterdictionInverted.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "viral:blocks/torchInterdiction" - }, - "display": { - "thirdperson": { - "rotation": [ - -90, - 0, - 0 - ], - "translation": [ - 0, - 1, - -3 - ], - "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, - "firstperson": { - "rotation": [ - 0, - -135, - 25 - ], - "translation": [ - 0, - 4, - 2 - ], - "scale": [ - 1.7, - 1.7, - 1.7 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/viral/models/item/torchinterdiction.json b/src/main/resources/assets/viral/models/item/torchinterdiction.json new file mode 100644 index 0000000..c79f229 --- /dev/null +++ b/src/main/resources/assets/viral/models/item/torchinterdiction.json @@ -0,0 +1,42 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "viral:blocks/torchinterdiction" + }, + "display": { + "thirdperson": { + "rotation": [ + -90, + 0, + 0 + ], + "translation": [ + 0, + 1, + -3 + ], + "scale": [ + 0.55, + 0.55, + 0.55 + ] + }, + "firstperson": { + "rotation": [ + 0, + -135, + 25 + ], + "translation": [ + 0, + 4, + 2 + ], + "scale": [ + 1.7, + 1.7, + 1.7 + ] + } + } +} diff --git a/src/main/resources/assets/viral/models/item/torchinterdictioninverted.json b/src/main/resources/assets/viral/models/item/torchinterdictioninverted.json new file mode 100644 index 0000000..c79f229 --- /dev/null +++ b/src/main/resources/assets/viral/models/item/torchinterdictioninverted.json @@ -0,0 +1,42 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "viral:blocks/torchinterdiction" + }, + "display": { + "thirdperson": { + "rotation": [ + -90, + 0, + 0 + ], + "translation": [ + 0, + 1, + -3 + ], + "scale": [ + 0.55, + 0.55, + 0.55 + ] + }, + "firstperson": { + "rotation": [ + 0, + -135, + 25 + ], + "translation": [ + 0, + 4, + 2 + ], + "scale": [ + 1.7, + 1.7, + 1.7 + ] + } + } +} diff --git a/src/main/resources/assets/viral/textures/blocks/torchInterdiction.png b/src/main/resources/assets/viral/textures/blocks/torchinterdiction.png similarity index 100% rename from src/main/resources/assets/viral/textures/blocks/torchInterdiction.png rename to src/main/resources/assets/viral/textures/blocks/torchinterdiction.png diff --git a/src/main/resources/assets/viral/textures/items/syringeCure.png b/src/main/resources/assets/viral/textures/items/syringecure.png similarity index 100% rename from src/main/resources/assets/viral/textures/items/syringeCure.png rename to src/main/resources/assets/viral/textures/items/syringecure.png diff --git a/src/main/resources/assets/viral/textures/items/syringeEmpty.png b/src/main/resources/assets/viral/textures/items/syringeempty.png similarity index 100% rename from src/main/resources/assets/viral/textures/items/syringeEmpty.png rename to src/main/resources/assets/viral/textures/items/syringeempty.png diff --git a/src/main/resources/assets/viral/textures/items/syringeFilled.png b/src/main/resources/assets/viral/textures/items/syringefilled.png similarity index 100% rename from src/main/resources/assets/viral/textures/items/syringeFilled.png rename to src/main/resources/assets/viral/textures/items/syringefilled.png diff --git a/src/main/resources/assets/viral/textures/items/syringeImmunity.png b/src/main/resources/assets/viral/textures/items/syringeimmunity.png similarity index 100% rename from src/main/resources/assets/viral/textures/items/syringeImmunity.png rename to src/main/resources/assets/viral/textures/items/syringeimmunity.png