From 86083712ad8caf0270d92ff04162d536c1db6e44 Mon Sep 17 00:00:00 2001 From: dpeter99 Date: Mon, 22 Aug 2016 11:14:09 +0200 Subject: [PATCH] Item Fixes (More) - fixed ItemCristalSeed in code please look at that if it is correct :) - fixed stairs - added crank item texture --- .../appeng/items/misc/ItemCrystalSeed.java | 18 +++++++++--------- .../blockstates/cell_workbench.json | 2 +- ...air_fluix.json => stair_common_fluix.json} | 0 ...s.json => stair_common_quartz_certus.json} | 0 ... stair_common_quartz_certus_chiseled.json} | 0 ...=> stair_common_quartz_certus_pillar.json} | 0 ....json => stair_common_skystone_block.json} | 0 ....json => stair_common_skystone_brick.json} | 0 ...=> stair_common_skystone_brick_small.json} | 0 ....json => stair_common_skystone_stone.json} | 0 .../models/item/crank.json | 6 ++++++ ...air_fluix.json => stair_common_fluix.json} | 0 ...s.json => stair_common_quartz_certus.json} | 0 ... stair_common_quartz_certus_chiseled.json} | 0 ...=> stair_common_quartz_certus_pillar.json} | 0 ....json => stair_common_skystone_block.json} | 0 ....json => stair_common_skystone_brick.json} | 0 ...=> stair_common_skystone_brick_small.json} | 0 ....json => stair_common_skystone_stone.json} | 0 .../textures/items/crank.png | Bin 0 -> 366 bytes 20 files changed, 16 insertions(+), 10 deletions(-) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_fluix.json => stair_common_fluix.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_quartz_certus.json => stair_common_quartz_certus.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_quartz_certus_chiseled.json => stair_common_quartz_certus_chiseled.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_quartz_certus_pillar.json => stair_common_quartz_certus_pillar.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_skystone_block.json => stair_common_skystone_block.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_skystone_brick.json => stair_common_skystone_brick.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_skystone_brick_small.json => stair_common_skystone_brick_small.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_skystone_stone.json => stair_common_skystone_stone.json} (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crank.json rename src/main/resources/assets/appliedenergistics2/models/item/{stair_fluix.json => stair_common_fluix.json} (100%) rename src/main/resources/assets/appliedenergistics2/models/item/{stair_quartz_certus.json => stair_common_quartz_certus.json} (100%) rename src/main/resources/assets/appliedenergistics2/models/item/{stair_quartz_certus_chiseled.json => stair_common_quartz_certus_chiseled.json} (100%) rename src/main/resources/assets/appliedenergistics2/models/item/{stair_quartz_certus_pillar.json => stair_common_quartz_certus_pillar.json} (100%) rename src/main/resources/assets/appliedenergistics2/models/item/{stair_skystone_block.json => stair_common_skystone_block.json} (100%) rename src/main/resources/assets/appliedenergistics2/models/item/{stair_skystone_brick.json => stair_common_skystone_brick.json} (100%) rename src/main/resources/assets/appliedenergistics2/models/item/{stair_skystone_brick_small.json => stair_common_skystone_brick_small.json} (100%) rename src/main/resources/assets/appliedenergistics2/models/item/{stair_skystone_stone.json => stair_common_skystone_stone.json} (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/textures/items/crank.png diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index 3b89979a..2c15110f 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeed.java +++ b/src/main/java/appeng/items/misc/ItemCrystalSeed.java @@ -260,19 +260,19 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal } private static final ModelResourceLocation[] MODELS_CERTUS = { - new ModelResourceLocation( "appliedenergistics2:ItemCrystalSeed.Certus" ), - new ModelResourceLocation( "appliedenergistics2:ItemCrystalSeed.Certus2" ), - new ModelResourceLocation( "appliedenergistics2:ItemCrystalSeed.Certus3" ) + new ModelResourceLocation( "appliedenergistics2:crystal_seed_certus" ), + new ModelResourceLocation( "appliedenergistics2:crystal_seed_certus2" ), + new ModelResourceLocation( "appliedenergistics2:crystal_seed_certus3" ) }; private static final ModelResourceLocation[] MODELS_FLUIX = { - new ModelResourceLocation( "appliedenergistics2:ItemCrystalSeed.Fluix" ), - new ModelResourceLocation( "appliedenergistics2:ItemCrystalSeed.Fluix2" ), - new ModelResourceLocation( "appliedenergistics2:ItemCrystalSeed.Fluix3" ) + new ModelResourceLocation( "appliedenergistics2:crystal_seed_fluix" ), + new ModelResourceLocation( "appliedenergistics2:crystal_seed_fluix2" ), + new ModelResourceLocation( "appliedenergistics2:crystal_seed_fluix3" ) }; private static final ModelResourceLocation[] MODELS_NETHER = { - new ModelResourceLocation( "appliedenergistics2:ItemCrystalSeed.Nether" ), - new ModelResourceLocation( "appliedenergistics2:ItemCrystalSeed.Nether2" ), - new ModelResourceLocation( "appliedenergistics2:ItemCrystalSeed.Nether3" ) + new ModelResourceLocation( "appliedenergistics2:crystal_seed_nether" ), + new ModelResourceLocation( "appliedenergistics2:crystal_seed_nether2" ), + new ModelResourceLocation( "appliedenergistics2:crystal_seed_nether3" ) }; @Override diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json b/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json index f9828a89..e4bd6617 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:cell_work_bench" + "model": "appliedenergistics2:cell_workbench" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_fluix.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_fluix.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_fluix.json rename to src/main/resources/assets/appliedenergistics2/blockstates/stair_common_fluix.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_quartz_certus.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus.json rename to src/main/resources/assets/appliedenergistics2/blockstates/stair_common_quartz_certus.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_chiseled.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_quartz_certus_chiseled.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_chiseled.json rename to src/main/resources/assets/appliedenergistics2/blockstates/stair_common_quartz_certus_chiseled.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_pillar.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_quartz_certus_pillar.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_pillar.json rename to src/main/resources/assets/appliedenergistics2/blockstates/stair_common_quartz_certus_pillar.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_block.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_block.json rename to src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_block.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_brick.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick.json rename to src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_brick.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick_small.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_brick_small.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick_small.json rename to src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_brick_small.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_stone.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_stone.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_stone.json rename to src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_stone.json diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crank.json b/src/main/resources/assets/appliedenergistics2/models/item/crank.json new file mode 100644 index 00000000..6a8f48cb --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crank.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/crank" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_fluix.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_fluix.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/item/stair_fluix.json rename to src/main/resources/assets/appliedenergistics2/models/item/stair_common_fluix.json diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus.json rename to src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus.json diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus_chiseled.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus_chiseled.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus_chiseled.json rename to src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus_chiseled.json diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus_pillar.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus_pillar.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus_pillar.json rename to src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus_pillar.json diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_block.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_block.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_block.json rename to src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_block.json diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_brick.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_brick.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_brick.json rename to src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_brick.json diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_brick_small.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_brick_small.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_brick_small.json rename to src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_brick_small.json diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_stone.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_stone.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_stone.json rename to src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_stone.json diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/crank.png b/src/main/resources/assets/appliedenergistics2/textures/items/crank.png new file mode 100644 index 0000000000000000000000000000000000000000..45c80f8fdc4401319ecf826635e64d83da96e55c GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFC-