diff --git a/build.gradle b/build.gradle index 02c8066..958e99e 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ repositories { } } -version = "0.2a" +version = "0.3b" group = "com.sosnitzka.zcompression" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "zcompression" diff --git a/src/main/java/items/ItemAardiumIngot.java b/src/main/java/items/ItemAardiumIngot.java new file mode 100644 index 0000000..7031806 --- /dev/null +++ b/src/main/java/items/ItemAardiumIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemAardiumIngot extends BasicItem { + + public ItemAardiumIngot() { + super("aardium_ingot"); + } +} diff --git a/src/main/java/items/ItemAdamantiteIngot.java b/src/main/java/items/ItemAdamantiteIngot.java new file mode 100644 index 0000000..4004318 --- /dev/null +++ b/src/main/java/items/ItemAdamantiteIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemAdamantiteIngot extends BasicItem { + + public ItemAdamantiteIngot() { + super("adamantite_ingot"); + } +} diff --git a/src/main/java/items/ItemArcaniteIngot.java b/src/main/java/items/ItemArcaniteIngot.java new file mode 100644 index 0000000..924f335 --- /dev/null +++ b/src/main/java/items/ItemArcaniteIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemArcaniteIngot extends BasicItem { + + public ItemArcaniteIngot() { + super("arcanite_ingot"); + } +} diff --git a/src/main/java/items/ItemAxiidianIngot.java b/src/main/java/items/ItemAxiidianIngot.java new file mode 100644 index 0000000..20af19f --- /dev/null +++ b/src/main/java/items/ItemAxiidianIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemAxiidianIngot extends BasicItem { + + public ItemAxiidianIngot() { + super("axiidian_ingot"); + } +} diff --git a/src/main/java/items/ItemBismuthIngot.java b/src/main/java/items/ItemBismuthIngot.java new file mode 100644 index 0000000..36ee0b7 --- /dev/null +++ b/src/main/java/items/ItemBismuthIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemBismuthIngot extends BasicItem { + + public ItemBismuthIngot() { + super("bismuth_ingot"); + } +} diff --git a/src/main/java/items/ItemEterniteIngot.java b/src/main/java/items/ItemEterniteIngot.java new file mode 100644 index 0000000..be67eed --- /dev/null +++ b/src/main/java/items/ItemEterniteIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemEterniteIngot extends BasicItem { + + public ItemEterniteIngot() { + super("eternite_ingot"); + } +} diff --git a/src/main/java/items/ItemFuelBrick.java b/src/main/java/items/ItemFuelBrick.java new file mode 100644 index 0000000..a5d2c20 --- /dev/null +++ b/src/main/java/items/ItemFuelBrick.java @@ -0,0 +1,9 @@ +package items; + +public class ItemFuelBrick extends BasicItem { + + public ItemFuelBrick() { + super("fuel_brick"); + } + +} diff --git a/src/main/java/items/ItemIgnititeIngot.java b/src/main/java/items/ItemIgnititeIngot.java new file mode 100644 index 0000000..c06baf0 --- /dev/null +++ b/src/main/java/items/ItemIgnititeIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemIgnititeIngot extends BasicItem { + + public ItemIgnititeIngot() { + super("ignitite_ingot"); + } +} diff --git a/src/main/java/items/ItemIronNugget.java b/src/main/java/items/ItemIronNugget.java new file mode 100644 index 0000000..c5e8572 --- /dev/null +++ b/src/main/java/items/ItemIronNugget.java @@ -0,0 +1,8 @@ +package items; + +public class ItemIronNugget extends BasicItem{ + + public ItemIronNugget(){ + super("iron_nugget"); + } +} diff --git a/src/main/java/items/ItemKarmesineIngot.java b/src/main/java/items/ItemKarmesineIngot.java new file mode 100644 index 0000000..761977b --- /dev/null +++ b/src/main/java/items/ItemKarmesineIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemKarmesineIngot extends BasicItem{ + + public ItemKarmesineIngot(){ + super("karmesine_ingot"); + } +} diff --git a/src/main/java/items/ItemMeteoriteIngot.java b/src/main/java/items/ItemMeteoriteIngot.java new file mode 100644 index 0000000..7296282 --- /dev/null +++ b/src/main/java/items/ItemMeteoriteIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemMeteoriteIngot extends BasicItem{ + + public ItemMeteoriteIngot(){ + super("meteorite_ingot"); + } +} diff --git a/src/main/java/items/ItemMindoriteIngot.java b/src/main/java/items/ItemMindoriteIngot.java new file mode 100644 index 0000000..a098b16 --- /dev/null +++ b/src/main/java/items/ItemMindoriteIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemMindoriteIngot extends BasicItem{ + + public ItemMindoriteIngot(){ + super("mindorite_ingot"); + } +} diff --git a/src/main/java/items/ItemMythrilIngot.java b/src/main/java/items/ItemMythrilIngot.java new file mode 100644 index 0000000..1d5066b --- /dev/null +++ b/src/main/java/items/ItemMythrilIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemMythrilIngot extends BasicItem{ + + public ItemMythrilIngot(){ + super("mythril_ingot"); + } +} diff --git a/src/main/java/items/ItemPalladiumIngot.java b/src/main/java/items/ItemPalladiumIngot.java new file mode 100644 index 0000000..4dd8911 --- /dev/null +++ b/src/main/java/items/ItemPalladiumIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemPalladiumIngot extends BasicItem{ + + public ItemPalladiumIngot(){ + super("palladium_ingot"); + } +} diff --git a/src/main/java/items/ItemPrometheumIngot.java b/src/main/java/items/ItemPrometheumIngot.java new file mode 100644 index 0000000..853309c --- /dev/null +++ b/src/main/java/items/ItemPrometheumIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemPrometheumIngot extends BasicItem{ + + public ItemPrometheumIngot(){ + super("prometheum_ingot"); + } +} diff --git a/src/main/java/items/ItemSlaggoldIngot.java b/src/main/java/items/ItemSlaggoldIngot.java new file mode 100644 index 0000000..1ccf7aa --- /dev/null +++ b/src/main/java/items/ItemSlaggoldIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemSlaggoldIngot extends BasicItem { + + public ItemSlaggoldIngot() { + super("slaggold_ingot"); + } +} diff --git a/src/main/java/items/ItemTiberiumIngot.java b/src/main/java/items/ItemTiberiumIngot.java new file mode 100644 index 0000000..9cf8da8 --- /dev/null +++ b/src/main/java/items/ItemTiberiumIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemTiberiumIngot extends BasicItem{ + + public ItemTiberiumIngot(){ + super("tiberium_ingot"); + } +} diff --git a/src/main/java/items/ItemVibraniumIngot.java b/src/main/java/items/ItemVibraniumIngot.java new file mode 100644 index 0000000..88ab2f3 --- /dev/null +++ b/src/main/java/items/ItemVibraniumIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemVibraniumIngot extends BasicItem{ + + public ItemVibraniumIngot(){ + super("vibranium_ingot"); + } +} diff --git a/src/main/java/items/ItemYrdeanIngot.java b/src/main/java/items/ItemYrdeanIngot.java new file mode 100644 index 0000000..5b4f99c --- /dev/null +++ b/src/main/java/items/ItemYrdeanIngot.java @@ -0,0 +1,8 @@ +package items; + +public class ItemYrdeanIngot extends BasicItem{ + + public ItemYrdeanIngot(){ + super("yrdean_ingot"); + } +} diff --git a/src/main/java/main/ZCompression.java b/src/main/java/main/ZCompression.java index 3b3990f..db1d743 100644 --- a/src/main/java/main/ZCompression.java +++ b/src/main/java/main/ZCompression.java @@ -2,9 +2,8 @@ package main; import blocks.*; import blocks.category.BasicBlockOreGlow; -import items.ItemLignite; -import items.ItemSlagironIngot; -import main.util.LigniteFuelHandler; +import items.*; +import main.util.FuelHandler; import main.util.recipes.Crafting; import main.util.recipes.Smelting; import main.world.ZWorldGen; @@ -23,10 +22,31 @@ import proxy.ServerProxy; public class ZCompression { static final String MODID = "zcompression"; - static final String VERSION = "1.0"; + static final String VERSION = "0.3b"; // Items public static ItemSlagironIngot slagironIngot = new ItemSlagironIngot(); public static ItemLignite lignite = new ItemLignite(); + public static ItemIronNugget iron_nugget = new ItemIronNugget(); + public static ItemSlaggoldIngot slaggoldIngot = new ItemSlaggoldIngot(); + public static ItemFuelBrick fuel_brick = new ItemFuelBrick(); + + public static ItemAardiumIngot aardiumIngot = new ItemAardiumIngot(); + public static ItemAdamantiteIngot adamantiteIngot = new ItemAdamantiteIngot(); + public static ItemArcaniteIngot arcaniteIngot = new ItemArcaniteIngot(); + public static ItemAxiidianIngot axiidianIngot = new ItemAxiidianIngot(); + public static ItemBismuthIngot bismuthIngot = new ItemBismuthIngot(); + public static ItemEterniteIngot eterniteIngot = new ItemEterniteIngot(); + public static ItemIgnititeIngot ignititeIngot = new ItemIgnititeIngot(); + public static ItemKarmesineIngot karmesineIngot = new ItemKarmesineIngot(); + public static ItemMeteoriteIngot meteoriteIngot = new ItemMeteoriteIngot(); + public static ItemMindoriteIngot mindoriteIngot = new ItemMindoriteIngot(); + public static ItemMythrilIngot mythrilIngot = new ItemMythrilIngot(); + public static ItemPalladiumIngot palladiumIngot = new ItemPalladiumIngot(); + public static ItemPrometheumIngot prometheumIngot = new ItemPrometheumIngot(); + public static ItemTiberiumIngot tiberiumIngot = new ItemTiberiumIngot(); + public static ItemVibraniumIngot vibraniumIngot = new ItemVibraniumIngot(); + public static ItemYrdeanIngot yrdeanIngot = new ItemYrdeanIngot(); + //Blocks, esp. for tconstruct public static BlockAardiumOre aardiumOre = new BlockAardiumOre(); public static BlockAdamantiteOre adamantiteOre = new BlockAdamantiteOre(); @@ -66,7 +86,30 @@ public class ZCompression { public void preInit(FMLPreInitializationEvent e) { //Items GameRegistry.register(slagironIngot); + GameRegistry.register(fuel_brick); + GameRegistry.register(slaggoldIngot); + GameRegistry.register(iron_nugget); GameRegistry.register(lignite); + + GameRegistry.register(aardiumIngot); + GameRegistry.register(adamantiteIngot); + GameRegistry.register(arcaniteIngot); + GameRegistry.register(axiidianIngot); + GameRegistry.register(bismuthIngot); + GameRegistry.register(eterniteIngot); + GameRegistry.register(ignititeIngot); + GameRegistry.register(karmesineIngot); + GameRegistry.register(meteoriteIngot); + GameRegistry.register(mindoriteIngot); + GameRegistry.register(mythrilIngot); + GameRegistry.register(palladiumIngot); + GameRegistry.register(prometheumIngot); + GameRegistry.register(tiberiumIngot); + GameRegistry.register(vibraniumIngot); + GameRegistry.register(yrdeanIngot); + + + //Blocks registerBlock(aardiumOre); registerBlock(adamantiteOre); @@ -98,7 +141,7 @@ public class ZCompression { public void init(FMLInitializationEvent e) { proxy.registerClientStuff(); GameRegistry.registerWorldGenerator(new ZWorldGen(), 100); - GameRegistry.registerFuelHandler(new LigniteFuelHandler()); + GameRegistry.registerFuelHandler(new FuelHandler()); new Smelting(); new Crafting(); diff --git a/src/main/java/main/util/LigniteFuelHandler.java b/src/main/java/main/util/FuelHandler.java similarity index 58% rename from src/main/java/main/util/LigniteFuelHandler.java rename to src/main/java/main/util/FuelHandler.java index 6fbb5c8..5a3dd31 100644 --- a/src/main/java/main/util/LigniteFuelHandler.java +++ b/src/main/java/main/util/FuelHandler.java @@ -3,14 +3,18 @@ package main.util; import main.ZCompression; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.IFuelHandler; +import org.apache.commons.lang3.RandomUtils; -public class LigniteFuelHandler implements IFuelHandler { +public class FuelHandler implements IFuelHandler { @Override public int getBurnTime(ItemStack fuel){ if(fuel.getItem().equals(ZCompression.lignite)) { return 200*2; } + if(fuel.getItem().equals(ZCompression.fuel_brick)) { + return RandomUtils.nextInt(1, 64) * 200; + } return 0; } diff --git a/src/main/java/main/util/recipes/Crafting.java b/src/main/java/main/util/recipes/Crafting.java index 5348a13..0dd05d2 100644 --- a/src/main/java/main/util/recipes/Crafting.java +++ b/src/main/java/main/util/recipes/Crafting.java @@ -1,5 +1,20 @@ package main.util.recipes; +import main.ZCompression; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.registry.GameRegistry; + public class Crafting { + public Crafting(){ + register(); + } + + private void register(){ + GameRegistry.addShapelessRecipe(new ItemStack(ZCompression.fuel_brick), new Object []{ + Items.COAL, Items.COAL, Items.COAL, ZCompression.lignite, ZCompression.lignite, ZCompression.lignite + }); + } + } diff --git a/src/main/java/main/util/recipes/Smelting.java b/src/main/java/main/util/recipes/Smelting.java index 1edc948..1ca2864 100644 --- a/src/main/java/main/util/recipes/Smelting.java +++ b/src/main/java/main/util/recipes/Smelting.java @@ -5,6 +5,7 @@ import main.ZCompression; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; +import org.apache.commons.lang3.RandomUtils; public class Smelting { public Smelting(){ @@ -12,7 +13,26 @@ public class Smelting { } private void register(){ - GameRegistry.addSmelting(ZCompression.slagironOre, new ItemStack(ZCompression.slagironIngot,2),1.0F); - GameRegistry.addSmelting(ZCompression.slagironIngot, new ItemStack(Items.GOLD_NUGGET),1.0F); + GameRegistry.addSmelting(ZCompression.slagironOre, new ItemStack(ZCompression.slagironIngot),1.0F); + GameRegistry.addSmelting(new ItemStack(ZCompression.slagironIngot, 3),new ItemStack(ZCompression.iron_nugget), 0); + GameRegistry.addSmelting(new ItemStack(ZCompression.slaggoldIngot, 3),new ItemStack(Items.GOLD_NUGGET), 0); + + GameRegistry.addSmelting(ZCompression.aardiumOre, new ItemStack(ZCompression.aardiumIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.arcaniteOre, new ItemStack(ZCompression.arcaniteIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.adamantiteOre, new ItemStack(ZCompression.adamantiteIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.axiidianOre, new ItemStack(ZCompression.axiidianIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.bismuthOre, new ItemStack(ZCompression.bismuthIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.eterniteOre, new ItemStack(ZCompression.eterniteIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.ignititeOre, new ItemStack(ZCompression.ignititeIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.karmesineOre, new ItemStack(ZCompression.karmesineIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.meteoriteOre, new ItemStack(ZCompression.meteoriteIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.mindoriteOre, new ItemStack(ZCompression.mindoriteIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.mythrilOre, new ItemStack(ZCompression.mythrilIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.palladiumOre, new ItemStack(ZCompression.palladiumIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.prometheumOre, new ItemStack(ZCompression.prometheumIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.tiberiumOre, new ItemStack(ZCompression.tiberiumIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.vibraniumOre, new ItemStack(ZCompression.vibraniumIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.yrdeanOre, new ItemStack(ZCompression.yrdeanIngot), RandomUtils.nextFloat(0F, 2F)); + } } diff --git a/src/main/java/main/world/ZWorldGen.java b/src/main/java/main/world/ZWorldGen.java index 346e6a3..04a36da 100644 --- a/src/main/java/main/world/ZWorldGen.java +++ b/src/main/java/main/world/ZWorldGen.java @@ -14,8 +14,8 @@ 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, 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, 21, 32, 64, 3, 6); + Generator.generateNetherOre(ZCompression.tiberiumOre.getDefaultState(), random, x, z, world, 60, 1, 128, 2, 7); + Generator.generateNetherOre(ZCompression.palladiumOre.getDefaultState(), random, x, z, world, 21, 32, 64, 2, 5); Generator.generateOre(ZCompression.prometheumOre.getDefaultState(), random, x, z, world, 21, 48, 64, 2, 4); } @@ -33,7 +33,7 @@ public class ZWorldGen implements IWorldGenerator { Generator.generateOre(ZCompression.karmesineOre.getDefaultState(), random, x, z, world, 30, 16, 48, 2, 5); Generator.generateOre(ZCompression.bismuthOre.getDefaultState(), random, x, z, world, 50, 50, 130, 2, 4); Generator.generateOre(ZCompression.mythrilOre.getDefaultState(), random, x, z, world, 18, 16, 32, 2, 4); - Generator.generateOre(ZCompression.meteoriteOre.getDefaultState(), random, x, z, world, 25, 0, 32, 3, 6); + Generator.generateOre(ZCompression.meteoriteOre.getDefaultState(), random, x, z, world, 12, 0, 32, 2, 10); Generator.generateOre(ZCompression.mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 200, 16, 96, 2, 4); Generator.generateOre(ZCompression.arcaniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 200, 16, 96, 2, 4); Generator.generateOre(ZCompression.eterniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 200, 16, 96, 2, 4); @@ -41,10 +41,10 @@ public class ZWorldGen implements IWorldGenerator { private void end(Random random, int x, int z, World world) { - Generator.generateEndOre(ZCompression.yrdeanOre.getDefaultState(), random, x, z, world, 20, 10, 35, 2, 6); - Generator.generateEndOre(ZCompression.ignititeOre.getDefaultState(), random, x, z, world, 20, 20, 45, 2, 6); - Generator.generateEndOre(ZCompression.axiidianOre.getDefaultState(), random, x, z, world, 20, 30, 55, 2, 6); - Generator.generateEndOre(ZCompression.aardiumOre.getDefaultState(), random, x, z, world, 20, 40, 65, 2, 6); + Generator.generateEndOre(ZCompression.yrdeanOre.getDefaultState(), random, x, z, world, 16, 10, 35, 2, 6); + Generator.generateEndOre(ZCompression.ignititeOre.getDefaultState(), random, x, z, world, 16, 20, 45, 2, 6); + Generator.generateEndOre(ZCompression.axiidianOre.getDefaultState(), random, x, z, world, 16, 30, 55, 2, 6); + Generator.generateEndOre(ZCompression.aardiumOre.getDefaultState(), random, x, z, world, 16, 40, 65, 2, 6); } diff --git a/src/main/java/proxy/ClientProxy.java b/src/main/java/proxy/ClientProxy.java index da0558c..8705f7c 100644 --- a/src/main/java/proxy/ClientProxy.java +++ b/src/main/java/proxy/ClientProxy.java @@ -12,7 +12,27 @@ public class ClientProxy extends ServerProxy { public void registerClientStuff() { // Items registerItemModel(ZCompression.slagironIngot); + registerItemModel(ZCompression.slaggoldIngot); registerItemModel(ZCompression.lignite); + registerItemModel(ZCompression.iron_nugget); + registerItemModel(ZCompression.fuel_brick); + + registerItemModel(ZCompression.aardiumIngot); + registerItemModel(ZCompression.adamantiteIngot); + registerItemModel(ZCompression.arcaniteIngot); + registerItemModel(ZCompression.axiidianIngot); + registerItemModel(ZCompression.bismuthIngot); + registerItemModel(ZCompression.eterniteIngot); + registerItemModel(ZCompression.ignititeIngot); + registerItemModel(ZCompression.karmesineIngot); + registerItemModel(ZCompression.meteoriteIngot); + registerItemModel(ZCompression.mindoriteIngot); + registerItemModel(ZCompression.mythrilIngot); + registerItemModel(ZCompression.palladiumIngot); + registerItemModel(ZCompression.prometheumIngot); + registerItemModel(ZCompression.tiberiumIngot); + registerItemModel(ZCompression.vibraniumIngot); + registerItemModel(ZCompression.yrdeanIngot); // Blocks registerBlockModel(ZCompression.aardiumOre); diff --git a/src/main/resources/assets/zcompression/lang/de_DE.lang b/src/main/resources/assets/zcompression/lang/de_DE.lang index a1dbe1f..ca82882 100644 --- a/src/main/resources/assets/zcompression/lang/de_DE.lang +++ b/src/main/resources/assets/zcompression/lang/de_DE.lang @@ -22,3 +22,23 @@ tile.yrdean_ore.name=Yrdeanerz tile.aardium_ore.name=Aardiumerz tile.ignitite_ore.name=Ignititerz tile.axiidian_ore.name=Axiidianerz +item.adamantite_ingot.name=Adamantitbarren +item.arcanite_ingot.name=Arcanitbarren +item.bismuth_ingot.name=Bismuthbarren +item.eternite_ingot.name=Eternitbarren +item.karmesine_ingot.name=Karmesinbarren +item.meteorite_ingot.name=Meteoritbarren +item.mindorite_ingot.name=Mindoritbarren +item.mythril_ingot.name=Mythrilbarren +item.palladium_ingot.name=Palladiumbarren +item.prometheum_ingot.name=Prometheumbarren +item.slagiron_ingot.name=Unreiner Eisenbarren +item.slaggold_ingot.name=Unreiner Goldbarren +item.tiberium_ingot.name=Tiberiumbarren +item.vibranium_ingot.name=Vibraniumbarren +item.yrdean_ingot.name=Yrdeanbarren +item.aardium_ingot.name=Aardiumbarren +item.ignitite_ingot.name=Ignititbarren +item.axiidian_ingot.name=Axiidianbarren +item.fuel_brick.name=Brennstoffziegel +item.iron_nugget.name=Eisennugget diff --git a/src/main/resources/assets/zcompression/lang/en_US.lang b/src/main/resources/assets/zcompression/lang/en_US.lang index e4703c5..e471ba1 100644 --- a/src/main/resources/assets/zcompression/lang/en_US.lang +++ b/src/main/resources/assets/zcompression/lang/en_US.lang @@ -21,4 +21,25 @@ 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 +tile.axiidian_ore.name=Axiidian Ore + +item.adamantite_ingot.name=Adamantite Ingot +item.arcanite_ingot.name=Arcanite Ingot +item.bismuth_ingot.name=Bismuth Ingot +item.eternite_ingot.name=Eternite Ingot +item.karmesine_ingot.name=Karmesine Ingot +item.meteorite_ingot.name=Meteorite Ingot +item.mindorite_ingot.name=Mindorite Ingot +item.mythril_ingot.name=Mythril Ingot +item.palladium_ingot.name=Palladium Ingot +item.prometheum_ingot.name=Prometheum Ingot +item.slagiron_ingot.name=Slagiron Ingot +item.slaggold_ingot.name=Slaggold Ingot +item.tiberium_ingot.name=Tiberium Ingot +item.vibranium_ingot.name=Vibranium Ingot +item.yrdean_ingot.name=Yrdean Ingot +item.aardium_ingot.name=Aardium Ingot +item.ignitite_ingot.name=Ignitite Ingot +item.axiidian_ingot.name=Axiidian Ingot +item.fuel_brick.name=Fuelbrick +item.iron_nugget.name=Iron Nugget \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/aardium_ingot.json b/src/main/resources/assets/zcompression/models/item/aardium_ingot.json new file mode 100644 index 0000000..c8b6245 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/aardium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/aardium_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/adamantite_ingot.json b/src/main/resources/assets/zcompression/models/item/adamantite_ingot.json new file mode 100644 index 0000000..0dc0b99 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/adamantite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/adamantite_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/arcanite_ingot.json b/src/main/resources/assets/zcompression/models/item/arcanite_ingot.json new file mode 100644 index 0000000..1fc383c --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/arcanite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/arcanite_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/axiidian_ingot.json b/src/main/resources/assets/zcompression/models/item/axiidian_ingot.json new file mode 100644 index 0000000..d62521d --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/axiidian_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/axiidian_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/bismuth_ingot.json b/src/main/resources/assets/zcompression/models/item/bismuth_ingot.json new file mode 100644 index 0000000..46f098a --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/bismuth_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/bismuth_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/eternite_ingot.json b/src/main/resources/assets/zcompression/models/item/eternite_ingot.json new file mode 100644 index 0000000..6bcfd39 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/eternite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/eternite_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/fuel_brick.json b/src/main/resources/assets/zcompression/models/item/fuel_brick.json new file mode 100644 index 0000000..e894320 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/fuel_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/fuel_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/ignitite_ingot.json b/src/main/resources/assets/zcompression/models/item/ignitite_ingot.json new file mode 100644 index 0000000..16819a1 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/ignitite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/ignitite_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/iron_nugget.json b/src/main/resources/assets/zcompression/models/item/iron_nugget.json new file mode 100644 index 0000000..08dc88a --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/iron_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/iron_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/karmesine_ingot.json b/src/main/resources/assets/zcompression/models/item/karmesine_ingot.json new file mode 100644 index 0000000..95485e2 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/karmesine_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/karmesine_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/meteorite_ingot.json b/src/main/resources/assets/zcompression/models/item/meteorite_ingot.json new file mode 100644 index 0000000..887a193 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/meteorite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/meteorite_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/mindorite_ingot.json b/src/main/resources/assets/zcompression/models/item/mindorite_ingot.json new file mode 100644 index 0000000..5a08838 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/mindorite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/mindorite_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/mythril_ingot.json b/src/main/resources/assets/zcompression/models/item/mythril_ingot.json new file mode 100644 index 0000000..c2c587f --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/mythril_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/mythril_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/palladium_ingot.json b/src/main/resources/assets/zcompression/models/item/palladium_ingot.json new file mode 100644 index 0000000..f3c7b1d --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/palladium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/palladium_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/prometheum_ingot.json b/src/main/resources/assets/zcompression/models/item/prometheum_ingot.json new file mode 100644 index 0000000..be35ba4 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/prometheum_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/prometheum_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/slaggold_ingot.json b/src/main/resources/assets/zcompression/models/item/slaggold_ingot.json new file mode 100644 index 0000000..9b2515b --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/slaggold_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/slaggold_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/tiberium_ingot.json b/src/main/resources/assets/zcompression/models/item/tiberium_ingot.json new file mode 100644 index 0000000..f4010d6 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/tiberium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/tiberium_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/vibranium_ingot.json b/src/main/resources/assets/zcompression/models/item/vibranium_ingot.json new file mode 100644 index 0000000..6c94adc --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/vibranium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/vibranium_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/yrdean_ingot.json b/src/main/resources/assets/zcompression/models/item/yrdean_ingot.json new file mode 100644 index 0000000..5b43077 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/yrdean_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/yrdean_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 3b7ef1a..90e783b 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "zcompression", "name": "Zkaface Compression Mod", "description": "A modification to compress several items and blocks to a solid block with several features coming up on exponent five.", - "version": "0.1", + "version": "0.3b", "mcversion": "1.9", "url": "www.sosnitzka.com", "updateUrl": "", @@ -11,6 +11,6 @@ "credits": "Chefe. He's there, if you need him.", "logoFile": "", "screenshots": [], - "dependencies": [] + "dependencies": ["tconstruct"] } ] \ No newline at end of file