From c1ba3a19f44b512f060b966f6bc1025a9b7c928f Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Fri, 13 May 2016 20:43:51 +0200 Subject: [PATCH] FluidTest --- .../java/com/sosnitzka/ztic_addon/Blocks.java | 7 +++---- .../java/com/sosnitzka/ztic_addon/Fluids.java | 2 +- src/main/java/com/sosnitzka/ztic_addon/Items.java | 14 +++++++------- .../blockstates/instablePolynium_block.json | 7 +++++++ .../blockstates/instable_polynium_block.json | 7 ------- .../models/block/instablePolynium_block.json | 6 ++++++ .../models/block/instable_polynium_block.json | 6 ------ ...ium_block.json => instablePolynium_block.json} | 2 +- ...ynium_block.png => instablePolynium_block.png} | Bin ...ynium_ingot.png => instablePolynium_ingot.png} | Bin 10 files changed, 25 insertions(+), 26 deletions(-) create mode 100644 src/main/resources/assets/ztic_addon/blockstates/instablePolynium_block.json delete mode 100644 src/main/resources/assets/ztic_addon/blockstates/instable_polynium_block.json create mode 100644 src/main/resources/assets/ztic_addon/models/block/instablePolynium_block.json delete mode 100644 src/main/resources/assets/ztic_addon/models/block/instable_polynium_block.json rename src/main/resources/assets/ztic_addon/models/item/{instable_polynium_block.json => instablePolynium_block.json} (81%) rename src/main/resources/assets/ztic_addon/textures/blocks/{instable_polynium_block.png => instablePolynium_block.png} (100%) rename src/main/resources/assets/ztic_addon/textures/items/tic/{instable_polynium_ingot.png => instablePolynium_ingot.png} (100%) diff --git a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java index 5e37393..bae3645 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java @@ -3,8 +3,8 @@ package com.sosnitzka.ztic_addon; import com.google.common.base.Joiner; import com.sosnitzka.ztic_addon.blocks.BlockLignite; import com.sosnitzka.ztic_addon.blocks.BlockTiberium; -import com.sosnitzka.ztic_addon.generic.BasicBlockGround; import com.sosnitzka.ztic_addon.generic.BasicBlock; +import com.sosnitzka.ztic_addon.generic.BasicBlockGround; import com.sosnitzka.ztic_addon.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -66,7 +66,7 @@ public class Blocks { public static Block imperomiteBlock = new BasicBlock("imperomite_block", Material.ROCK, 24.0f, 25.0f, 3, PREFIX_BLOCK); public static Block instableDyoniteBlock = new BasicBlock("instable_dyonite_block", Material.ROCK, 23.0f, 25.0f, 3, PREFIX_BLOCK); public static Block instableNitroniteBlock = new BasicBlock("instable_nitronite_block", Material.ROCK, 13.0f, 15.0f, 1, PREFIX_BLOCK); - public static Block instablePolyniumBlock = new BasicBlock("instable_polynium_block", Material.ROCK, 60.0f, 500.0f, 4, PREFIX_BLOCK); + public static Block instablePolyniumBlock = new BasicBlock("instablePolynium_block", Material.ROCK, 60.0f, 500.0f, 4, PREFIX_BLOCK); public static Block instablePrysociteBlock = new BasicBlock("instable_prysocite_block", Material.ROCK, 12.0f, 12.0f, 2, PREFIX_BLOCK); public static Block proxideumBlock = new BasicBlock("proxideum_block", Material.ROCK, 25.0f, 25.0f, 4, PREFIX_BLOCK); public static Block radiantPliniumBlock = new BasicBlock("radiant_plinium_block", Material.ROCK, 25.0f, 25.0f, 3, PREFIX_BLOCK); @@ -89,7 +89,6 @@ public class Blocks { if (((BasicBlock) block).isOreDict()) { String oreDictName; String[] nameParts = block.getUnlocalizedName().replace("tile.", "").split("_"); - System.out.println(); if (nameParts.length > 2) { oreDictName = Joiner.on("_").join(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1)); @@ -98,7 +97,7 @@ public class Blocks { } OreDictionary.registerOre(((BasicBlock) block).getOreDictPrefix() + StringUtils.capitalize(oreDictName), block); - System.out.println(String.format("Registered OreDict: %s", "ore" + StringUtils.capitalize(oreDictName))); + System.out.println(String.format("Registered OreDict: %s", ((BasicBlock) block).getOreDictPrefix() + StringUtils.capitalize(oreDictName))); } } } catch (IllegalAccessException e) { diff --git a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java index c6f7016..5868a67 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java @@ -29,7 +29,7 @@ public class Fluids { public static BasicTinkerFluid astriumFluid = new BasicTinkerFluid("astrium", 0xFF7a3b74, true, 200, 10, 4000); public static BasicTinkerFluid instableNitroniteFluid = new BasicTinkerFluid("instable_nitronite", 0xFF659933, true, 200, 10, 4000); public static BasicTinkerFluid proxideumFluid = new BasicTinkerFluid("proxideum", 0xFF416565, true, 200, 10, 4000); - public static BasicTinkerFluid instablePolyniumFluid = new BasicTinkerFluid("instable_polynium", 0xFF6c6aa3, true, 200, 10, 4000); + public static BasicTinkerFluid instablePolyniumFluid = new BasicTinkerFluid("instablePolynium", 0xFF6c6aa3, true, 200, 10, 4000); public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomite", 0xFF339966, true, 200, 10, 4000); public static BasicTinkerFluid cryptogenFluid = new BasicTinkerFluid("cryptogen", 0xFF9f8a4a, true, 200, 10, 4000); public static BasicTinkerFluid fractoryteFluid = new BasicTinkerFluid("fractoryte", 0xFFb44a14, true, 200, 10, 4000); diff --git a/src/main/java/com/sosnitzka/ztic_addon/Items.java b/src/main/java/com/sosnitzka/ztic_addon/Items.java index d2ccb40..806debe 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Items.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Items.java @@ -43,19 +43,19 @@ public class Items { public static Item yrdeanIngot = new BasicItem("yrdean_ingot", PREFIX_INGOT); public static Item astriumIngot = new BasicItem("astrium_ingot", PREFIX_INGOT); - public static Item instableNitroniteIngot = new BasicItem("instable_nitronite_ingot", PREFIX_INGOT); + public static Item instableNitroniteIngot = new BasicItem("instableNitronite_ingot", PREFIX_INGOT); public static Item proxideumIngot = new BasicItem("proxideum_ingot", PREFIX_INGOT); - public static Item instablePolyniumIngot = new BasicItem("instable_polyniumingot", PREFIX_INGOT); + public static Item instablePolyniumIngot = new BasicItem("instablePolynium_ingot", PREFIX_INGOT); public static Item imperomiteIngot = new BasicItem("imperomite_ingot", PREFIX_INGOT); public static Item cryptogenIngot = new BasicItem("cryptogen_ingot", PREFIX_INGOT); public static Item fractoryteIngot = new BasicItem("fractoryte_ingot", PREFIX_INGOT); public static Item seismodiumIngot = new BasicItem("seismodium_ingot", PREFIX_INGOT); public static Item terramiteIngot = new BasicItem("terramite_ingot", PREFIX_INGOT); - public static Item instablePrysociteIngot = new BasicItem("instable_prysocite_ingot", PREFIX_INGOT); - public static Item blazingXylititeIngot = new BasicItem("blazing_xylitite_ingot", PREFIX_INGOT); - public static Item instableDyoniteIngot = new BasicItem("instable_dyonite_ingot", PREFIX_INGOT); + public static Item instablePrysociteIngot = new BasicItem("instablePrysocite_ingot", PREFIX_INGOT); + public static Item blazingXylititeIngot = new BasicItem("blazingXylitite_ingot", PREFIX_INGOT); + public static Item instableDyoniteIngot = new BasicItem("instableDyonite_ingot", PREFIX_INGOT); public static Item ultraniteIngot = new BasicItem("ultranite_ingot", PREFIX_INGOT); - public static Item radiantPliniumIngot = new BasicItem("radiant_plinium_ingot", PREFIX_INGOT); + public static Item radiantPliniumIngot = new BasicItem("radiantPlinium_ingot", PREFIX_INGOT); public static Item dysprosaniumIngot = new BasicItem("dysprosanium_ingot", PREFIX_INGOT); public static Item refractiveBysumIngot = new BasicItem("refractive_bysum_ingot", PREFIX_INGOT); @@ -83,7 +83,7 @@ public class Items { } OreDictionary.registerOre(((BasicItem) item).getOreDictPrefix() + StringUtils.capitalize(oreDictName), item); - System.out.println(String.format("Registered OreDict: %s", "ingot" + StringUtils.capitalize(oreDictName))); + System.out.println(String.format("Registered OreDict: %s", ((BasicItem) item).getOreDictPrefix() + StringUtils.capitalize(oreDictName))); } } } catch (IllegalAccessException e) { diff --git a/src/main/resources/assets/ztic_addon/blockstates/instablePolynium_block.json b/src/main/resources/assets/ztic_addon/blockstates/instablePolynium_block.json new file mode 100644 index 0000000..9370d6b --- /dev/null +++ b/src/main/resources/assets/ztic_addon/blockstates/instablePolynium_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "ztic_addon:instablePolynium_block" + } + } +} diff --git a/src/main/resources/assets/ztic_addon/blockstates/instable_polynium_block.json b/src/main/resources/assets/ztic_addon/blockstates/instable_polynium_block.json deleted file mode 100644 index 8908a1b..0000000 --- a/src/main/resources/assets/ztic_addon/blockstates/instable_polynium_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "ztic_addon:instable_polynium_block" - } - } -} diff --git a/src/main/resources/assets/ztic_addon/models/block/instablePolynium_block.json b/src/main/resources/assets/ztic_addon/models/block/instablePolynium_block.json new file mode 100644 index 0000000..b5b01e5 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/block/instablePolynium_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "ztic_addon:blocks/instablePolynium_block" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/block/instable_polynium_block.json b/src/main/resources/assets/ztic_addon/models/block/instable_polynium_block.json deleted file mode 100644 index a488ca6..0000000 --- a/src/main/resources/assets/ztic_addon/models/block/instable_polynium_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "ztic_addon:blocks/instable_polynium_block" - } -} diff --git a/src/main/resources/assets/ztic_addon/models/item/instable_polynium_block.json b/src/main/resources/assets/ztic_addon/models/item/instablePolynium_block.json similarity index 81% rename from src/main/resources/assets/ztic_addon/models/item/instable_polynium_block.json rename to src/main/resources/assets/ztic_addon/models/item/instablePolynium_block.json index ec6389c..c6d8532 100644 --- a/src/main/resources/assets/ztic_addon/models/item/instable_polynium_block.json +++ b/src/main/resources/assets/ztic_addon/models/item/instablePolynium_block.json @@ -1,5 +1,5 @@ { - "parent": "ztic_addon:block/instable_polynium_block", + "parent": "ztic_addon:block/instablePolynium_block", "display": { "thirdperson": { "rotation": [ diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/instable_polynium_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/instablePolynium_block.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/blocks/instable_polynium_block.png rename to src/main/resources/assets/ztic_addon/textures/blocks/instablePolynium_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/instable_polynium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/instablePolynium_ingot.png similarity index 100% rename from src/main/resources/assets/ztic_addon/textures/items/tic/instable_polynium_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/instablePolynium_ingot.png