From 72b27f87c7ca5f93aafc681c35d462862e350783 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Mon, 2 May 2016 11:13:34 +0200 Subject: [PATCH] Again some stuff... still learning git ;) --- src/main/java/blocks/BlockAardiumOre.java | 11 +++++++ src/main/java/blocks/BlockAdamantiteOre.java | 3 +- src/main/java/blocks/BlockArcaniteOre.java | 3 +- src/main/java/blocks/BlockAxiidianOre.java | 11 +++++++ src/main/java/blocks/BlockBasalt.java | 3 +- src/main/java/blocks/BlockBismuthOre.java | 3 +- src/main/java/blocks/BlockEterniteOre.java | 3 +- src/main/java/blocks/BlockIgnititeOre.java | 11 +++++++ src/main/java/blocks/BlockKarmesineOre.java | 3 +- src/main/java/blocks/BlockLigniteOre.java | 3 +- src/main/java/blocks/BlockMeteoriteOre.java | 3 +- src/main/java/blocks/BlockMindoriteOre.java | 3 +- src/main/java/blocks/BlockMythrilOre.java | 3 +- src/main/java/blocks/BlockPalladiumOre.java | 3 +- src/main/java/blocks/BlockPrometheumOre.java | 6 ++-- src/main/java/blocks/BlockRottenGround.java | 3 +- src/main/java/blocks/BlockSlaggoldOre.java | 11 +++++++ src/main/java/blocks/BlockSlagironOre.java | 3 +- src/main/java/blocks/BlockTiberiumOre.java | 5 +-- src/main/java/blocks/BlockVibraniumre.java | 3 +- src/main/java/blocks/BlockYrdeanOre.java | 11 +++++++ .../java/blocks/category/BasicBlockOre.java | 6 ++-- .../blocks/category/BasicBlockOreGlow.java | 16 ++++++++++ src/main/java/main/ZCompression.java | 25 +++++++++++++-- src/main/java/main/util/Generator.java | 4 +++ src/main/java/main/world/ZWorldGen.java | 29 ++++++++++++------ src/main/java/proxy/ClientProxy.java | 7 +++++ .../zcompression/blockstates/aardium_ore.json | 5 +++ .../blockstates/axiidian_ore.json | 5 +++ .../blockstates/ignitite_ore.json | 5 +++ .../blockstates/karmesine_ore.json | 2 +- .../blockstates/slaggold_ore.json | 5 +++ .../zcompression/blockstates/yrdean_ore.json | 5 +++ .../assets/zcompression/lang/de_DE.lang | 6 +++- .../assets/zcompression/lang/en_US.lang | 7 ++++- .../models/block/aardium_ore.json | 6 ++++ .../models/block/axiidian_ore.json | 6 ++++ .../models/block/ignitite_ore.json | 6 ++++ .../models/block/slaggold_ore.json | 6 ++++ .../zcompression/models/block/yrdean_ore.json | 6 ++++ .../zcompression/models/item/aardium_ore.json | 10 ++++++ .../models/item/axiidian_ore.json | 10 ++++++ .../models/item/ignitite_ore.json | 10 ++++++ .../models/item/slaggold_ore.json | 10 ++++++ .../zcompression/models/item/yrdean_ore.json | 10 ++++++ .../textures/blocks/aardium_ore.png | Bin 0 -> 16194 bytes .../textures/blocks/axiidian_ore.png | Bin 0 -> 15997 bytes .../textures/blocks/ignitite_ore.png | Bin 0 -> 16033 bytes .../textures/blocks/slaggold_ore.png | Bin 0 -> 15870 bytes .../textures/blocks/yrdean_ore.png | Bin 0 -> 16019 bytes 50 files changed, 280 insertions(+), 35 deletions(-) create mode 100644 src/main/java/blocks/BlockAardiumOre.java create mode 100644 src/main/java/blocks/BlockAxiidianOre.java create mode 100644 src/main/java/blocks/BlockIgnititeOre.java create mode 100644 src/main/java/blocks/BlockSlaggoldOre.java create mode 100644 src/main/java/blocks/BlockYrdeanOre.java create mode 100644 src/main/java/blocks/category/BasicBlockOreGlow.java create mode 100644 src/main/resources/assets/zcompression/blockstates/aardium_ore.json create mode 100644 src/main/resources/assets/zcompression/blockstates/axiidian_ore.json create mode 100644 src/main/resources/assets/zcompression/blockstates/ignitite_ore.json create mode 100644 src/main/resources/assets/zcompression/blockstates/slaggold_ore.json create mode 100644 src/main/resources/assets/zcompression/blockstates/yrdean_ore.json create mode 100644 src/main/resources/assets/zcompression/models/block/aardium_ore.json create mode 100644 src/main/resources/assets/zcompression/models/block/axiidian_ore.json create mode 100644 src/main/resources/assets/zcompression/models/block/ignitite_ore.json create mode 100644 src/main/resources/assets/zcompression/models/block/slaggold_ore.json create mode 100644 src/main/resources/assets/zcompression/models/block/yrdean_ore.json create mode 100644 src/main/resources/assets/zcompression/models/item/aardium_ore.json create mode 100644 src/main/resources/assets/zcompression/models/item/axiidian_ore.json create mode 100644 src/main/resources/assets/zcompression/models/item/ignitite_ore.json create mode 100644 src/main/resources/assets/zcompression/models/item/slaggold_ore.json create mode 100644 src/main/resources/assets/zcompression/models/item/yrdean_ore.json create mode 100644 src/main/resources/assets/zcompression/textures/blocks/aardium_ore.png create mode 100644 src/main/resources/assets/zcompression/textures/blocks/axiidian_ore.png create mode 100644 src/main/resources/assets/zcompression/textures/blocks/ignitite_ore.png create mode 100644 src/main/resources/assets/zcompression/textures/blocks/slaggold_ore.png create mode 100644 src/main/resources/assets/zcompression/textures/blocks/yrdean_ore.png diff --git a/src/main/java/blocks/BlockAardiumOre.java b/src/main/java/blocks/BlockAardiumOre.java new file mode 100644 index 0000000..e9b9925 --- /dev/null +++ b/src/main/java/blocks/BlockAardiumOre.java @@ -0,0 +1,11 @@ +package blocks; + +import blocks.category.BasicBlockOre; +import net.minecraft.block.material.Material; + +public class BlockAardiumOre extends BasicBlockOre { + + public BlockAardiumOre() { + super("aardium_ore", Material.ROCK, 3.0f, 5.0f); + } +} diff --git a/src/main/java/blocks/BlockAdamantiteOre.java b/src/main/java/blocks/BlockAdamantiteOre.java index 75931e9..2d015b3 100644 --- a/src/main/java/blocks/BlockAdamantiteOre.java +++ b/src/main/java/blocks/BlockAdamantiteOre.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockAdamantiteOre extends BasicBlock { +public class BlockAdamantiteOre extends BasicBlockOre { public BlockAdamantiteOre() { super("adamantite_ore", Material.ROCK, 3.0f, 5.0f); diff --git a/src/main/java/blocks/BlockArcaniteOre.java b/src/main/java/blocks/BlockArcaniteOre.java index 014f563..46de274 100644 --- a/src/main/java/blocks/BlockArcaniteOre.java +++ b/src/main/java/blocks/BlockArcaniteOre.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockArcaniteOre extends BasicBlock { +public class BlockArcaniteOre extends BasicBlockOre { public BlockArcaniteOre() { super("arcanite_ore", Material.ROCK, 3.0f, 5.0f); diff --git a/src/main/java/blocks/BlockAxiidianOre.java b/src/main/java/blocks/BlockAxiidianOre.java new file mode 100644 index 0000000..73f81bd --- /dev/null +++ b/src/main/java/blocks/BlockAxiidianOre.java @@ -0,0 +1,11 @@ +package blocks; + +import blocks.category.BasicBlockOre; +import net.minecraft.block.material.Material; + +public class BlockAxiidianOre extends BasicBlockOre { + + public BlockAxiidianOre() { + super("axiidian_ore", Material.ROCK, 3.0f, 5.0f); + } +} diff --git a/src/main/java/blocks/BlockBasalt.java b/src/main/java/blocks/BlockBasalt.java index 73ae463..b0eb5ae 100644 --- a/src/main/java/blocks/BlockBasalt.java +++ b/src/main/java/blocks/BlockBasalt.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockBasalt extends BasicBlock { +public class BlockBasalt extends BasicBlockOre { public BlockBasalt() { super("basalt", Material.ROCK, 12.0f, 2.0f); diff --git a/src/main/java/blocks/BlockBismuthOre.java b/src/main/java/blocks/BlockBismuthOre.java index b58cecf..a3386b6 100644 --- a/src/main/java/blocks/BlockBismuthOre.java +++ b/src/main/java/blocks/BlockBismuthOre.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockBismuthOre extends BasicBlock { +public class BlockBismuthOre extends BasicBlockOre { public BlockBismuthOre() { super("bismuth_ore", Material.ROCK, 3.0f, 5.0f); diff --git a/src/main/java/blocks/BlockEterniteOre.java b/src/main/java/blocks/BlockEterniteOre.java index 8854b91..91132a0 100644 --- a/src/main/java/blocks/BlockEterniteOre.java +++ b/src/main/java/blocks/BlockEterniteOre.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockEterniteOre extends BasicBlock { +public class BlockEterniteOre extends BasicBlockOre { public BlockEterniteOre() { super("eternite_ore", Material.ROCK, 3.0f, 5.0f); diff --git a/src/main/java/blocks/BlockIgnititeOre.java b/src/main/java/blocks/BlockIgnititeOre.java new file mode 100644 index 0000000..845b784 --- /dev/null +++ b/src/main/java/blocks/BlockIgnititeOre.java @@ -0,0 +1,11 @@ +package blocks; + +import blocks.category.BasicBlockOre; +import net.minecraft.block.material.Material; + +public class BlockIgnititeOre extends BasicBlockOre { + + public BlockIgnititeOre() { + super("ignitite_ore", Material.ROCK, 3.0f, 5.0f); + } +} diff --git a/src/main/java/blocks/BlockKarmesineOre.java b/src/main/java/blocks/BlockKarmesineOre.java index 9c4f5f0..1c16a5c 100644 --- a/src/main/java/blocks/BlockKarmesineOre.java +++ b/src/main/java/blocks/BlockKarmesineOre.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockKarmesineOre extends BasicBlock { +public class BlockKarmesineOre extends BasicBlockOre { public BlockKarmesineOre() { super("karmesine_ore", Material.ROCK, 3.0f, 5.0f); diff --git a/src/main/java/blocks/BlockLigniteOre.java b/src/main/java/blocks/BlockLigniteOre.java index 5064b5f..d2507bf 100644 --- a/src/main/java/blocks/BlockLigniteOre.java +++ b/src/main/java/blocks/BlockLigniteOre.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockLigniteOre extends BasicBlock { +public class BlockLigniteOre extends BasicBlockOre { public BlockLigniteOre() { super("lignite_ore", Material.ROCK, 3.0f, 5.0f); diff --git a/src/main/java/blocks/BlockMeteoriteOre.java b/src/main/java/blocks/BlockMeteoriteOre.java index a074316..3604e3d 100644 --- a/src/main/java/blocks/BlockMeteoriteOre.java +++ b/src/main/java/blocks/BlockMeteoriteOre.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockMeteoriteOre extends BasicBlock { +public class BlockMeteoriteOre extends BasicBlockOre { public BlockMeteoriteOre() { super("meteorite_ore", Material.ROCK, 3.0f, 5.0f); diff --git a/src/main/java/blocks/BlockMindoriteOre.java b/src/main/java/blocks/BlockMindoriteOre.java index 07b04ff..32f6c1c 100644 --- a/src/main/java/blocks/BlockMindoriteOre.java +++ b/src/main/java/blocks/BlockMindoriteOre.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockMindoriteOre extends BasicBlock { +public class BlockMindoriteOre extends BasicBlockOre { public BlockMindoriteOre() { super("mindorite_ore", Material.ROCK, 3.0f, 5.0f); diff --git a/src/main/java/blocks/BlockMythrilOre.java b/src/main/java/blocks/BlockMythrilOre.java index 4a19c57..0bf2b23 100644 --- a/src/main/java/blocks/BlockMythrilOre.java +++ b/src/main/java/blocks/BlockMythrilOre.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockMythrilOre extends BasicBlock { +public class BlockMythrilOre extends BasicBlockOre { public BlockMythrilOre() { super("mythril_ore", Material.ROCK, 3.0f, 5.0f); diff --git a/src/main/java/blocks/BlockPalladiumOre.java b/src/main/java/blocks/BlockPalladiumOre.java index 7e6d146..5dc5b15 100644 --- a/src/main/java/blocks/BlockPalladiumOre.java +++ b/src/main/java/blocks/BlockPalladiumOre.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockPalladiumOre extends BasicBlock { +public class BlockPalladiumOre extends BasicBlockOre { public BlockPalladiumOre() { super("palladium_ore", Material.ROCK, 3.0f, 5.0f); diff --git a/src/main/java/blocks/BlockPrometheumOre.java b/src/main/java/blocks/BlockPrometheumOre.java index 7093806..f3fee45 100644 --- a/src/main/java/blocks/BlockPrometheumOre.java +++ b/src/main/java/blocks/BlockPrometheumOre.java @@ -1,10 +1,12 @@ package blocks; +import blocks.category.BasicBlockOre; +import blocks.category.BasicBlockOreGlow; import net.minecraft.block.material.Material; -public class BlockPrometheumOre extends BasicBlock { +public class BlockPrometheumOre extends BasicBlockOreGlow { public BlockPrometheumOre() { - super("prometheum_ore", Material.ROCK, 3.0f, 5.0f); + super("prometheum_ore", Material.ROCK, 3.0f, 5.0f, 0.25f); } } diff --git a/src/main/java/blocks/BlockRottenGround.java b/src/main/java/blocks/BlockRottenGround.java index a751a86..fc4e60c 100644 --- a/src/main/java/blocks/BlockRottenGround.java +++ b/src/main/java/blocks/BlockRottenGround.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockRottenGround extends BasicBlock { +public class BlockRottenGround extends BasicBlockOre { public BlockRottenGround() { super("rotten_ground", Material.GROUND, 1.0f, 1.0f); diff --git a/src/main/java/blocks/BlockSlaggoldOre.java b/src/main/java/blocks/BlockSlaggoldOre.java new file mode 100644 index 0000000..67cc801 --- /dev/null +++ b/src/main/java/blocks/BlockSlaggoldOre.java @@ -0,0 +1,11 @@ +package blocks; + +import blocks.category.BasicBlockOre; +import net.minecraft.block.material.Material; + +public class BlockSlaggoldOre extends BasicBlockOre { + + public BlockSlaggoldOre() { + super("slaggold_ore", Material.ROCK, 3.0f, 5.0f); + } +} diff --git a/src/main/java/blocks/BlockSlagironOre.java b/src/main/java/blocks/BlockSlagironOre.java index 61860c5..d1c283b 100644 --- a/src/main/java/blocks/BlockSlagironOre.java +++ b/src/main/java/blocks/BlockSlagironOre.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockSlagironOre extends BasicBlock { +public class BlockSlagironOre extends BasicBlockOre { public BlockSlagironOre() { super("slagiron_ore", Material.ROCK, 3.0f, 5.0f); diff --git a/src/main/java/blocks/BlockTiberiumOre.java b/src/main/java/blocks/BlockTiberiumOre.java index 5efbd55..3d19565 100644 --- a/src/main/java/blocks/BlockTiberiumOre.java +++ b/src/main/java/blocks/BlockTiberiumOre.java @@ -1,10 +1,11 @@ package blocks; +import blocks.category.BasicBlockOreGlow; import net.minecraft.block.material.Material; -public class BlockTiberiumOre extends BasicBlock { +public class BlockTiberiumOre extends BasicBlockOreGlow { public BlockTiberiumOre() { - super("tiberium_ore", Material.ROCK, 3.0f, 5.0f); + super("tiberium_ore", Material.ROCK, 3.0f, 5.0f, 0.66f); } } diff --git a/src/main/java/blocks/BlockVibraniumre.java b/src/main/java/blocks/BlockVibraniumre.java index 2e9ab54..203e4b2 100644 --- a/src/main/java/blocks/BlockVibraniumre.java +++ b/src/main/java/blocks/BlockVibraniumre.java @@ -1,8 +1,9 @@ package blocks; +import blocks.category.BasicBlockOre; import net.minecraft.block.material.Material; -public class BlockVibraniumre extends BasicBlock { +public class BlockVibraniumre extends BasicBlockOre { public BlockVibraniumre() { super("vibranium_ore", Material.ROCK, 3.0f, 5.0f); diff --git a/src/main/java/blocks/BlockYrdeanOre.java b/src/main/java/blocks/BlockYrdeanOre.java new file mode 100644 index 0000000..ef676d0 --- /dev/null +++ b/src/main/java/blocks/BlockYrdeanOre.java @@ -0,0 +1,11 @@ +package blocks; + +import blocks.category.BasicBlockOre; +import net.minecraft.block.material.Material; + +public class BlockYrdeanOre extends BasicBlockOre { + + public BlockYrdeanOre() { + super("yrdean_ore", Material.ROCK, 3.0f, 5.0f); + } +} diff --git a/src/main/java/blocks/category/BasicBlockOre.java b/src/main/java/blocks/category/BasicBlockOre.java index 3e4810e..fa5cca1 100644 --- a/src/main/java/blocks/category/BasicBlockOre.java +++ b/src/main/java/blocks/category/BasicBlockOre.java @@ -1,11 +1,11 @@ -package blocks; +package blocks.category; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -public class BasicBlock extends Block { +public class BasicBlockOre extends Block { - public BasicBlock(String name, Material material, float hardness, float resistance) { + public BasicBlockOre(String name, Material material, float hardness, float resistance) { super(material); setUnlocalizedName(name); setRegistryName(name); diff --git a/src/main/java/blocks/category/BasicBlockOreGlow.java b/src/main/java/blocks/category/BasicBlockOreGlow.java new file mode 100644 index 0000000..a3ca81d --- /dev/null +++ b/src/main/java/blocks/category/BasicBlockOreGlow.java @@ -0,0 +1,16 @@ +package blocks.category; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class BasicBlockOreGlow extends Block { + + public BasicBlockOreGlow(String name, Material material, float hardness, float resistance, float glow) { + super(material); + setUnlocalizedName(name); + setRegistryName(name); + setHardness(hardness); + setResistance(resistance); + setLightLevel(glow); + } +} diff --git a/src/main/java/main/ZCompression.java b/src/main/java/main/ZCompression.java index 0eea668..db9f88e 100644 --- a/src/main/java/main/ZCompression.java +++ b/src/main/java/main/ZCompression.java @@ -1,11 +1,13 @@ package main; -import blocks.BasicBlock; +import blocks.BlockAardiumOre; import blocks.BlockAdamantiteOre; import blocks.BlockArcaniteOre; +import blocks.BlockAxiidianOre; import blocks.BlockBasalt; import blocks.BlockBismuthOre; import blocks.BlockEterniteOre; +import blocks.BlockIgnititeOre; import blocks.BlockKarmesineOre; import blocks.BlockLigniteOre; import blocks.BlockMeteoriteOre; @@ -14,9 +16,13 @@ import blocks.BlockMythrilOre; import blocks.BlockPalladiumOre; import blocks.BlockPrometheumOre; import blocks.BlockRottenGround; +import blocks.BlockSlaggoldOre; import blocks.BlockSlagironOre; import blocks.BlockTiberiumOre; import blocks.BlockVibraniumre; +import blocks.BlockYrdeanOre; +import blocks.category.BasicBlockOre; +import blocks.category.BasicBlockOreGlow; import items.ItemSlagiron; import main.world.ZWorldGen; import net.minecraft.item.ItemBlock; @@ -43,11 +49,14 @@ public class ZCompression { //Blocks, esp. for tconstruct + public static BlockAardiumOre aardiumOre = new BlockAardiumOre(); public static BlockAdamantiteOre adamantiteOre = new BlockAdamantiteOre(); public static BlockArcaniteOre arcaniteOre = new BlockArcaniteOre(); + public static BlockAxiidianOre axiidianOre = new BlockAxiidianOre(); public static BlockBasalt basalt = new BlockBasalt(); public static BlockBismuthOre bismuthOre = new BlockBismuthOre(); public static BlockEterniteOre eterniteOre = new BlockEterniteOre(); + public static BlockIgnititeOre ignititeOre = new BlockIgnititeOre(); public static BlockKarmesineOre karmesineOre = new BlockKarmesineOre(); public static BlockLigniteOre ligniteOre = new BlockLigniteOre(); public static BlockMeteoriteOre meteoriteOre = new BlockMeteoriteOre(); @@ -57,18 +66,23 @@ public class ZCompression { public static BlockPrometheumOre prometheumOre = new BlockPrometheumOre(); public static BlockRottenGround rottenGround = new BlockRottenGround(); public static BlockSlagironOre slagironOre = new BlockSlagironOre(); + public static BlockSlaggoldOre slaggoldOre = new BlockSlaggoldOre(); public static BlockTiberiumOre tiberiumOre = new BlockTiberiumOre(); public static BlockVibraniumre vibraniumOre = new BlockVibraniumre(); + public static BlockYrdeanOre yrdeanOre = new BlockYrdeanOre(); @EventHandler public void preInit(FMLPreInitializationEvent e) { GameRegistry.register(slagiron); + registerBlock(aardiumOre); registerBlock(adamantiteOre); registerBlock(arcaniteOre); + registerBlock(axiidianOre); registerBlock(basalt); registerBlock(bismuthOre); registerBlock(eterniteOre); + registerBlock(ignititeOre); registerBlock(karmesineOre); registerBlock(ligniteOre); registerBlock(meteoriteOre); @@ -78,8 +92,10 @@ public class ZCompression { registerBlock(prometheumOre); registerBlock(rottenGround); registerBlock(slagironOre); + registerBlock(slaggoldOre); registerBlock(tiberiumOre); registerBlock(vibraniumOre); + registerBlock(yrdeanOre); } @@ -95,7 +111,12 @@ public class ZCompression { } - private static void registerBlock(BasicBlock block) { + private static void registerBlock(BasicBlockOre block) { + GameRegistry.register(block); + GameRegistry.register(new ItemBlock(block).setRegistryName(block.getRegistryName())); + } + + private static void registerBlock(BasicBlockOreGlow block) { GameRegistry.register(block); GameRegistry.register(new ItemBlock(block).setRegistryName(block.getRegistryName())); } diff --git a/src/main/java/main/util/Generator.java b/src/main/java/main/util/Generator.java index 563e679..aa6fc00 100644 --- a/src/main/java/main/util/Generator.java +++ b/src/main/java/main/util/Generator.java @@ -18,6 +18,10 @@ public class Generator { public static void generateNetherOre(IBlockState state, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) { generateOre(state, Blocks.NETHERRACK.getDefaultState(), null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize); } + + public static void generateEndOre(IBlockState state, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) { + generateOre(state, Blocks.END_STONE.getDefaultState(), null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize); + } public static void generateOre(IBlockState state, IBlockState replace, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize) { generateOre(state, replace, null, null, random, chunkX, chunkZ, world, chance, minY, maxY, minSize, maxSize); diff --git a/src/main/java/main/world/ZWorldGen.java b/src/main/java/main/world/ZWorldGen.java index 22b7d79..5ed4689 100644 --- a/src/main/java/main/world/ZWorldGen.java +++ b/src/main/java/main/world/ZWorldGen.java @@ -14,27 +14,38 @@ import java.util.Random; public class ZWorldGen implements IWorldGenerator { private void nether(Random random, int x, int z, World world) { - Generator.generateNetherOre(ZCompression.adamantiteOre.getDefaultState(), random, x, z, world, 24, 1, 32, 2, 5); + Generator.generateNetherOre(ZCompression.adamantiteOre.getDefaultState(), random, x, z, world, 25, 1, 32, 2, 5); Generator.generateNetherOre(ZCompression.tiberiumOre.getDefaultState(), random, x, z, world, 60, 1, 128, 2, 10); - Generator.generateNetherOre(ZCompression.palladiumOre.getDefaultState(), random, x, z, world, 15, 32, 64, 3, 6); + Generator.generateNetherOre(ZCompression.palladiumOre.getDefaultState(), random, x, z, world, 21, 32, 64, 3, 6); Generator.generateOre(ZCompression.prometheumOre.getDefaultState(), random, x, z, world, 20, 48, 64, 2, 4); } private void world(Random random, int x, int z, World world) { Generator.generateOre(ZCompression.slagironOre.getDefaultState(), random, x, z, world, 40, 8, 96, 5, 16); + Generator.generateOre(ZCompression.slaggoldOre.getDefaultState(), random, x, z, world, 20, 8, 48, 5, 9); Generator.generateOre(ZCompression.ligniteOre.getDefaultState(), random, x, z, world, 40, 8, 96, 5, 15); - Generator.generateOre(Blocks.IRON_ORE.getDefaultState(), random, x, z, world, 40, 8, 96, 2, 10); - Generator.generateOre(ZCompression.basalt.getDefaultState(), Blocks.LAVA.getDefaultState(), random, x, z, world, 20, 8, 24, 2, 5); + Generator.generateOre(Blocks.IRON_ORE.getDefaultState(), random, x, z, world, 40, 8, 96, 2, 14); + + Generator.generateOre(ZCompression.basalt.getDefaultState(), Blocks.LAVA.getDefaultState(), random, x, z, world, 100, 8, 24, 2, 5); Generator.generateOre(ZCompression.rottenGround.getDefaultState(), Blocks.DIRT.getDefaultState(), random, x, z, world, 25, 50, 70, 2, 15); + - Generator.generateOre(ZCompression.vibraniumOre.getDefaultState(), random, x, z, world, 16, 48, 64, 2, 4); - Generator.generateOre(ZCompression.mythrilOre.getDefaultState(), random, x, z, world, 16, 16, 32, 2, 4); - Generator.generateOre(ZCompression.meteoriteOre.getDefaultState(), random, x, z, world, 25, 0, 32, 3, 6); - Generator.generateOre(ZCompression.mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 2450, 32, 96, 3, 6); + Generator.generateOre(ZCompression.vibraniumOre.getDefaultState(), random, x, z, world, 16, 48, 64, 2, 4); + Generator.generateOre(ZCompression.bismuthOre.getDefaultState(), random, x, z, world, 30, 16, 48, 2, 5); + Generator.generateOre(ZCompression.bismuthOre.getDefaultState(), random, x, z, world, 30, 32, 64, 2, 4); + Generator.generateOre(ZCompression.mythrilOre.getDefaultState(), random, x, z, world, 16, 16, 32, 2, 4); + Generator.generateOre(ZCompression.meteoriteOre.getDefaultState(), random, x, z, world, 25, 0, 32, 3, 6); + Generator.generateOre(ZCompression.mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 500, 16, 96, 2, 4); + Generator.generateOre(ZCompression.arcaniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 500, 16, 96, 2, 4); + Generator.generateOre(ZCompression.eterniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 500, 16, 96, 2, 4); } private void end(Random random, int x, int z, World world) { - + + Generator.generateEndOre(ZCompression.yrdeanOre.getDefaultState(), random, x, z, world, 19, 10, 35, 2, 5); + Generator.generateEndOre(ZCompression.ignititeOre.getDefaultState(), random, x, z, world, 19, 20, 45, 2, 5); + Generator.generateEndOre(ZCompression.axiidianOre.getDefaultState(), random, x, z, world, 19, 30, 55, 2, 5); + Generator.generateEndOre(ZCompression.aardiumOre.getDefaultState(), random, x, z, world, 19, 40, 65, 2, 5); } diff --git a/src/main/java/proxy/ClientProxy.java b/src/main/java/proxy/ClientProxy.java index 09099bd..3f64d77 100644 --- a/src/main/java/proxy/ClientProxy.java +++ b/src/main/java/proxy/ClientProxy.java @@ -14,11 +14,14 @@ public class ClientProxy extends ServerProxy { registerItemModel(ZCompression.slagiron); // Blocks + registerBlockModel(ZCompression.aardiumOre); registerBlockModel(ZCompression.adamantiteOre); registerBlockModel(ZCompression.arcaniteOre); + registerBlockModel(ZCompression.axiidianOre); registerBlockModel(ZCompression.basalt); registerBlockModel(ZCompression.bismuthOre); registerBlockModel(ZCompression.eterniteOre); + registerBlockModel(ZCompression.ignititeOre); registerBlockModel(ZCompression.karmesineOre); registerBlockModel(ZCompression.ligniteOre); registerBlockModel(ZCompression.meteoriteOre); @@ -28,8 +31,12 @@ public class ClientProxy extends ServerProxy { registerBlockModel(ZCompression.prometheumOre); registerBlockModel(ZCompression.rottenGround); registerBlockModel(ZCompression.slagironOre); + registerBlockModel(ZCompression.slaggoldOre); registerBlockModel(ZCompression.tiberiumOre); registerBlockModel(ZCompression.vibraniumOre); + registerBlockModel(ZCompression.yrdeanOre); + + } private static void registerBlockModel(Block block) { diff --git a/src/main/resources/assets/zcompression/blockstates/aardium_ore.json b/src/main/resources/assets/zcompression/blockstates/aardium_ore.json new file mode 100644 index 0000000..f690c3d --- /dev/null +++ b/src/main/resources/assets/zcompression/blockstates/aardium_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "zcompression:aardium_ore" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/blockstates/axiidian_ore.json b/src/main/resources/assets/zcompression/blockstates/axiidian_ore.json new file mode 100644 index 0000000..a64bee9 --- /dev/null +++ b/src/main/resources/assets/zcompression/blockstates/axiidian_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "zcompression:axiidian_ore" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/blockstates/ignitite_ore.json b/src/main/resources/assets/zcompression/blockstates/ignitite_ore.json new file mode 100644 index 0000000..aaa1f08 --- /dev/null +++ b/src/main/resources/assets/zcompression/blockstates/ignitite_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "zcompression:ignitite_ore" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/blockstates/karmesine_ore.json b/src/main/resources/assets/zcompression/blockstates/karmesine_ore.json index 548dbdb..0c524c7 100644 --- a/src/main/resources/assets/zcompression/blockstates/karmesine_ore.json +++ b/src/main/resources/assets/zcompression/blockstates/karmesine_ore.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "zcompression:karmesite_ore" } + "normal": { "model": "zcompression:karmesine_ore" } } } \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/blockstates/slaggold_ore.json b/src/main/resources/assets/zcompression/blockstates/slaggold_ore.json new file mode 100644 index 0000000..ad53974 --- /dev/null +++ b/src/main/resources/assets/zcompression/blockstates/slaggold_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "zcompression:slaggold_ore" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/blockstates/yrdean_ore.json b/src/main/resources/assets/zcompression/blockstates/yrdean_ore.json new file mode 100644 index 0000000..b51e4d5 --- /dev/null +++ b/src/main/resources/assets/zcompression/blockstates/yrdean_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "zcompression:yrdean_ore" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/lang/de_DE.lang b/src/main/resources/assets/zcompression/lang/de_DE.lang index 354be92..6b1d736 100644 --- a/src/main/resources/assets/zcompression/lang/de_DE.lang +++ b/src/main/resources/assets/zcompression/lang/de_DE.lang @@ -13,6 +13,10 @@ tile.palladium_ore.name=Palladiumerz tile.prometheum_ore.name=Prometheumerz tile.rotten_ground.name=Verrottete Erde tile.slagiron_ore.name=Unreines Eisenerz +tile.slaggold_ore.name=Unreines Golderz tile.tiberium_ore.name=Tiberiumerz tile.vibranium_ore.name=Vibraniumerz - +tile.yrdean_ore.name=Yrdeanerz +tile.aardium_ore.name=Aardiumerz +tile.ignitite_ore.name=Ignititerz +tile.axiidian_ore.name=Axiidianerz diff --git a/src/main/resources/assets/zcompression/lang/en_US.lang b/src/main/resources/assets/zcompression/lang/en_US.lang index cbf40a3..3ed16e9 100644 --- a/src/main/resources/assets/zcompression/lang/en_US.lang +++ b/src/main/resources/assets/zcompression/lang/en_US.lang @@ -13,5 +13,10 @@ tile.palladium_ore.name=Palladium Ore tile.prometheum_ore.name=Prometheum Ore tile.rotten_ground.name=Rotten Ground tile.slagiron_ore.name=Slagiron Ore +tile.slaggold_ore.name=Slaggold Ore tile.tiberium_ore.name=Tiberium Ore -tile.vibranium_ore.name=Vibranium Ore \ No newline at end of file +tile.vibranium_ore.name=Vibranium Ore +tile.yrdean_ore.name=Yrdean Ore +tile.aardium_ore.name=Aardium Ore +tile.ignitite_ore.name=Ignitite Ore +tile.axiidian_ore.name=Axiidian Ore \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/block/aardium_ore.json b/src/main/resources/assets/zcompression/models/block/aardium_ore.json new file mode 100644 index 0000000..02751a3 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/block/aardium_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "zcompression:blocks/aardium_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/block/axiidian_ore.json b/src/main/resources/assets/zcompression/models/block/axiidian_ore.json new file mode 100644 index 0000000..791ea7d --- /dev/null +++ b/src/main/resources/assets/zcompression/models/block/axiidian_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "zcompression:blocks/axiidian_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/block/ignitite_ore.json b/src/main/resources/assets/zcompression/models/block/ignitite_ore.json new file mode 100644 index 0000000..7aeae76 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/block/ignitite_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "zcompression:blocks/ignitite_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/block/slaggold_ore.json b/src/main/resources/assets/zcompression/models/block/slaggold_ore.json new file mode 100644 index 0000000..d0ad960 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/block/slaggold_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "zcompression:blocks/slaggold_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/block/yrdean_ore.json b/src/main/resources/assets/zcompression/models/block/yrdean_ore.json new file mode 100644 index 0000000..f56f793 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/block/yrdean_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "zcompression:blocks/yrdean_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/aardium_ore.json b/src/main/resources/assets/zcompression/models/item/aardium_ore.json new file mode 100644 index 0000000..85071c3 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/aardium_ore.json @@ -0,0 +1,10 @@ +{ + "parent": "zcompression:block/aardium_ore", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/axiidian_ore.json b/src/main/resources/assets/zcompression/models/item/axiidian_ore.json new file mode 100644 index 0000000..ad1df08 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/axiidian_ore.json @@ -0,0 +1,10 @@ +{ + "parent": "zcompression:block/axiidian_ore", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/ignitite_ore.json b/src/main/resources/assets/zcompression/models/item/ignitite_ore.json new file mode 100644 index 0000000..e165f48 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/ignitite_ore.json @@ -0,0 +1,10 @@ +{ + "parent": "zcompression:block/ignitite_ore", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/slaggold_ore.json b/src/main/resources/assets/zcompression/models/item/slaggold_ore.json new file mode 100644 index 0000000..7fdfe68 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/slaggold_ore.json @@ -0,0 +1,10 @@ +{ + "parent": "zcompression:block/slaggold_ore", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/yrdean_ore.json b/src/main/resources/assets/zcompression/models/item/yrdean_ore.json new file mode 100644 index 0000000..24d64eb --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/yrdean_ore.json @@ -0,0 +1,10 @@ +{ + "parent": "zcompression:block/yrdean_ore", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/textures/blocks/aardium_ore.png b/src/main/resources/assets/zcompression/textures/blocks/aardium_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..a84a712f1fd82b931f109f488ff33d84099e69e7 GIT binary patch literal 16194 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_qnj%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&sEK21Zr}21tfLRHB*To1c=IR*7MTp_P$|l@W>=NGj3ING(ZBNi0bu z$`oX^Namy@Tcza}&-<(XGp zl9-pA>gi%vkz1gbnVDjhY-pHbZkcMXYhh%Ts%x5PlBR2sVr;5wXk?yZW^R~fW@4BM zP8+D&kwOfdH?3f{d%EE8c#?rhl8I?@B7To!7=~eye^F+7W?o_rl7%3@q-3U8nV2P| zCK{Wk>6#cCS?C&Cn55_?nwcc)CZ!o!S{NH8rlnY>!Tf^77!0dCGC}cPi53l@xCu@z zL={EEJGkI2NGvK&1r;l{O0aSTUQ$D{IfS$U7f)7+$)Fp8VwPlS z36Ex^SVZ?C$TN_j00%Hy;ca4N0xx)xRN*!RH9U!^S0JXMYQt@OazSu8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb( zf`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3 zf+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=# zBpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&G zMA>L?LBfGZ5^r#EA@&rf=B3ywl`GlXMaKoQGB7YGBzpw;GB8xBGB7kWGcf%8&%n^| zl7XSrfPvvv0t1893^)r^Ln>~$Oxm9<;wW;Q-BD#~ui3$brU_0P z0xmTCcr7omhQ&8gS!~+DOHmOXiaY06p6GkxW7hVhBkiu~#XCpl%(gUqxMM#X#wzi-=AQB~GoY5(l=zWeSio3<8i{m7igdPZo{s>M6^Z``!CkkNwSe)hBv z6I-m4@4nK|Qd!yVcwo(jY5duhxiz^lb5vDSBXpa5fVq|V zq$|Rc(r%hD#8-Xa^Xp+r;>UfzEZ6p~pY@rgGUN@*nJQoTvtsUDy~PYN(%=|9`+uck0s2(ll& zdn0fo^MTDd(w>X*EvGEy^^q3eoSWeJYT~+OjGM!@%WZGeU1wXfxnTXHd2^PlA6hG8 zC2*~Hh3Lg&;*<2w*xX!mu61k8v|RO-%ahVy7F;Mg|Hjl?!=YU7;Qp@tztY0iB|1sl zd)hMW+y7@(bgUM?_&y#kPfiB+M#CAa=EnvwuU@-at4v{alKtep^RIq=^knmYzxp-b zc1Ry)h|${rJ480kq5A)78&qol`;+05Ul7JOBUy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/zcompression/textures/blocks/axiidian_ore.png b/src/main/resources/assets/zcompression/textures/blocks/axiidian_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..cb0b06df24f37141ba1dcf3b3dbfa2c23d8fe02e GIT binary patch literal 15997 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tY8nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcytPD-H4UDV|43G?gs6;cvH$NpatrEiwLn|W_D-#1`GmuoGn~_?Qn37nM zNR%naYLU!INw!MMFUn0UvCGU&Oi$G>$V<1;M+hRRgr_Pi=lq=fBH#R!R6AoEeQd%= zy1*&T$}_LHBrz{J)zihUBDX*DAmMLH_0T)K-VJ4#7sBQ&^%e!*gVfH6urQ)5^O1qm>)D%^&kh9?mPFvL_;ZMcn3&PdElPffAYhxrU9fUadQ#~g9x zAtYePi#fEq1!B~YjyXttqLzuUau%};wE;CNto(~IQ}ap^!R4NzjXs7LBF#Y5M}W%F zoKmoQb0Y%-0|R|S5DC?aERC);62DetX>_d!ouPS|C3Z$o+t7rObb;DFkcv6DATc@B z&dk)**wjWJT^LNkBD1q6(=&4K6() zqCqZhc3d|4;C=w8PXLyJ*EzIeKpjRa<00mbS^^0NBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnH zIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA z3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B z3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{ z(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J}<nTu$sZZAf7)d z{-_%R15==#YI!Jjb9NE+!HXQ$H=U)=LL zi)|eSN*(Xl&%5{ks=>1+L-EIzv;PaX?fbUIl7q)bJoe4C?*c4rGSMye7asDLs9ZVJ zQ??=c_Oaiax(t*AK0Px~<5>L0;Mt?ORScJIJiFg?fFW5gy}E8;qKT1FL+XSd|G0W~ zYM5$QEM9k5{)NmGL-F}vg+9q0i{bb?kL9>nrDNT)ZauzwEstRSo}C3bf~~@=@mZ>G z%u-dZIN9VoKA5boHbt9Nbu-^_v7aq37oGn4^U9ybuZ!~|tSui!ah3}UJ0?76jC=ev zP4Lppi7y3({Y)2%9qKqB|03e*x5Dbhj~e6BwOi`X6_^_e`ui9>Q}VU-`yINot9Mh6 zfl@_^S=yGvujOXWHS}1~+P|u8a$67oanZOx+g2@zxOFHi(lJo$!2h*H|J&ysyDLys z)jO>#?76@{2lrW3GxT;Th=<0+$t5h^)BJHyuYr1! z^N0SQO>{A8i23-Za_x>z+e~KdBGucLZ;LOys^rz*cdej$^OPf-FLV8}<@`I3a;T-pb*Y^YS-lXbTZ0nE>Ix=m`*}c9iT1~!wSRLzbV`wNPdFR@% zLe8q-XD>yTb?ddw`&PoOp0=%c&d!ex>pz~zX$fRAn794sF5_E`6XGY?1Xvc$JCMpa fJ$UBs@8t}81Kh6OJQw`{v_ag{)z4*}Q$iB}Z>_wg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/zcompression/textures/blocks/ignitite_ore.png b/src/main/resources/assets/zcompression/textures/blocks/ignitite_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..52340ce60ba3b674f217233c019c42c3c81109f3 GIT binary patch literal 16033 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tY8nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAc@sr`(^K^e^3rYe5rRl6;i<~XIX@@A$TvSF)y~*PADb|eE^tb- z^2{qPNz6-5^>neT$Su&z%uKOLO-oI(v@|l+HMcNM)U`}9NzqNTNHWtkNKQ^pv9w4r zF-uAT2coYpvUUukUGkGlLAk}##ST)iq~s@OrdT1IWtN7 zrkiSMVxpU5oM@zLWR#X@V40YdY+#xUvjU4T7*=^?7MJ7~RU)NgScw#zT8JtNlgP;g zmrwK2GmLptUl@rha{!pd39GSmjttg!Mg%1q5GNd%XBhBo>bVu&;YQ6B*+M{`QS z>dlP|3=9nP4M8MSE3!1Y)=2zXk)_eKB6No4WtP|(L2W}5M$!dp`#>t@;DW^DR68?M zQ)5#beRN@T9RZmYsW}lYnYpQX#hLkec7|q9J?IixHAdpnh$I2k2#G4B1~s_!gop;Y zxY=>p=!5$KpgsXu3SQ^XiUD;Pt&E45J8B6e9Ec=GgNw+3f+!meE=V{KNsa~=kpTr! zHX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_ z5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH z5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q z(cprF1Ciuta1j|$5M`sm1qlZt$?l$dM3>bYFg0*6xqUILvOUlbh|t(dOhqrz79`{}RbrOQ4X zf3QS4$~t(FdCc;SD(33x$G=`O&~rO{7Pj&EH0E$M41zs2?hA<204Duappd0%N3+*PvJ&T{+gSD9B|lei`{ z{+S_r;M?-u5AHC175Ssne<1Eub5+-Zd?Cq5{^w##&VH5gQR-$or(5CO%#kd6C3u30 znZ@>m70y4tzT&F0w`@K9K3~9)xh|VA$n8FV$PAZbF$?8yowklRIhXnQv>C_q7IIHL zskg@Nt;nQ95$z=cD+=x^_1%#2QA++7Y5uDFFvtD-4#|%fE?8~*uF33Dx9wZ2vTbgK zN3I2NekqV*Z{)HMIJmP_Wg}~@`+Onc{Ng4x?e1M>>YB}u#b&u2TQ|{tws6R^wgvll zbpHM57t-c;_@|lHpY=CcAGV1YGG7VaU}M|x_Po@bR}zzsxJkVJz$_ZCwtFF8`GSjD zoeSmuhn#vbBRD;<)?9;2DNUj0>y@dkD}~QW->R*V**}Y|v)H?0)?E9ZIgU?%s_x*f zUHL2}xZ$11?+xKq4Kq*fR-c^FA9vu|qs1mJ`v{FY=>$j?O*@eD+Q{v=YM}qY`-}|CYrVt@-MSZo PHj#U}`njxgN@xNA2oubj literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/zcompression/textures/blocks/slaggold_ore.png b/src/main/resources/assets/zcompression/textures/blocks/slaggold_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..eb64dd7cc602126413bbb860f26101dcc7c66c69 GIT binary patch literal 15870 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_tY8nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAcaUEX{wpAacYvT zL0X!TuAyP7nQl^&fthZyp{1#@aav-kWts)dA|%5wEb=ePOwY_q%t2BE@=Ho)idCvf zs*#0Jiji)Lv1y8KqPadieV*E zaB3l{C`=+J6I?Q*-Cc&Z^ zDHhSah=^)%0Hc+17FMS45(*MvU{$ycK@CqL3Sfw-sM>HFpPZ4Hm!6tprw{WPOaNWW zV2(NB%0o!NkQ#GX>lTPnLptUl@rha{!isXtGSmjttg!Mg%1q5GNd%XBhBo>bVu&;Y zQ6B*+M{`QS>dlP|3=9nP4M8MSE3!1Y)=2zXk)_eKB6No4WtP|(L2W}5M$!dp`#>t@ z;DW^DR68?MQ)5#beRN@T9RZmYsW}lYnYpQX#hLkec7|q9J?IixHAdpnh$I2k2#G4B z1~s_!gop;YxY=>p=!5$KpgsXu3SQ^XiUD;Pt&E45J8B6e9Ec=GgNw+3f+!meE=V{K zNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#V zfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZ zax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$a@a2CEqi z4C48d;*Yv9Ffd;7ba4!+xaAYHH%r<;Kvt%tX&NwqvExnFDlJVcZsDw~0U!O%_V zlx25EM}#Ot*4nLMp{0r~63WK@%Y&7KCf>7VSTZFf)TN`NBgpGaPY0i1=+}SG|6Q)) z7Zem^SabZ`=f{B@j0{ERR=pC~cr9y6)>?)GXFh-Wc>c7s%a?o78&(+^8}FV|>~+%3 z*jTVtV9jL(CyupS@3JpnWtpz+pZ5NF>YU;}!#06=*Q&pF2fLW$C_nSkTsF1CZ1u%o z+oT%LW|iFZ*ZY0){q6Jj_sv&Q68w5^Zt4DS=c?;VWmAeYCLdn?I)N+ns!m~=-#vL;}roXv-YnYPOQk{w&wGsxKjTf#pHGcK%PeNIt&2Ec(c05iT$D|p~bk zrmeAKTHC5st4?m+y;UrE3(MTSWsA#q&SLodsd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAc$V<1;M+hRRgr_Pi=lq=fBH#R!R6AoEeQd%= zy1*&T$}_LHBrz{J)zihUBDX*nt)teg`7#JAn8-hrvR%B^(t&#Y(B1@xdMd%F8%Pg@og4%{AjHCNOCl|hzux*veDpzgaeV}XmAl3 zP!MIK!37BiBFWLsqfNH`El zjs_Qz0R>Su8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb( zf`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3 zf+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fL*4_6YK2V5m}MU}$J&VEFl;fuZ3g14F3+1H-EX z1_rAc3=HD=lj4uMF)%Qtd%8G=RNRW0eAoMSfW)!S_j!-8?Ox$GLz-uq#TDMIOLy_M zHzmb{+24A#NFws}qd6rT)^gr9QD`ZtQq;Z@#H2Vac1qtC^Pm@%#h>3OSs(B3W>!C0 zIsfyX^S`^F{E~`V)6p<0oBw~lVv)m>1^4ti@-IcI7O&kA6?*ZF zR8oGlk=F9a5WmeFGdjhzyS!ukn~!wY|G9G1TZw)1`e%uLGqw#rSw2|3W-aR#Qg>+4K zvn~1D)|VA}l+}6<&+&e-?NSE9>y|Gpn&o=_fKAo=GY^_%-E?=<7g^-L_#kc7A=8o= zc|)#dOT*+#Lc$NK3PA0+;fqbcJYl=!2Q|-51d)GPf5Lc z%M|19EHQ0;p>m=1elOQI&-jisHq6W@;}x)M>Ysgd-EvnZo5FqdMfU9vk8Aq)r5M`n z;^gvnnj-w`w@U5YBbO#Jm3|fOkaS)KZN^g!YcV{1{u<4J|RSJGo zmbBey!t)>xwIYs)DTlMFxEDK1UddV|@%qmlsdHMAj?1sSk+RTEH!$1K%)T+w$2XTl z%qrz!lk6hrX$#ih)9WaUUc=G(Uqwb^-5Jh3QV&A4et!AK%kZ$xc4lV`vnXiWxTmY1 J%Q~loCIGCPyD9(x literal 0 HcmV?d00001