Gea/TAIGA
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

Renamed to Zkaface Tinkers' Construct Addon

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-05-12 16:31:27 +02:00
parent 272999d6e6
commit 52e43594ce
12 changed files with 101 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@@ -27,9 +27,9 @@ repositories {
}
}
version = "0.3b"
group = "com.sosnitzka.zcompression" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "zcompression"
version = "0.4"
group = "com.sosnitzka.ztic_addon" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "ztic_addon"
minecraft {
version = "1.9-12.16.1.1901"

4
src/main/java/blocks/BlockLigniteOre.java
View File

@@ -1,7 +1,7 @@
package blocks;
import blocks.category.BasicBlockOre;
import main.ZCompression;
import main.ZTiC;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.Item;
@@ -34,6 +34,6 @@ public class BlockLigniteOre extends BasicBlockOre {
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return ZCompression.lignite;
return ZTiC.lignite;
}
}

4
src/main/java/blocks/BlockTiberiumOre.java
View File

@@ -1,7 +1,7 @@
package blocks;
import blocks.category.BasicBlockOreGlow;
import main.ZCompression;
import main.ZTiC;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.Item;
@@ -34,6 +34,6 @@ public class BlockTiberiumOre extends BasicBlockOreGlow {
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return ZCompression.tiberiumShardInstable;
return ZTiC.tiberiumShardInstable;
}
}

9
src/main/java/main/ZCompression.java → src/main/java/main/ZTiC.java
View File

@@ -35,10 +35,10 @@ import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
import slimeknights.tconstruct.library.materials.HandleMaterialStats;
import slimeknights.tconstruct.library.materials.HeadMaterialStats;
@Mod(modid = ZCompression.MODID, version = ZCompression.VERSION)
public class ZCompression {
@Mod(modid = ZTiC.MODID, version = ZTiC.VERSION)
public class ZTiC {
static final String MODID = "zcompression";
static final String MODID = "ztic_addon";
static final String VERSION = "@VERSION@";
// ITEMS
@@ -312,7 +312,7 @@ public class ZCompression {
registerTinkerMaterial("Bismuth", bismuth, bismuthFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
registerTinkerMaterial("Karmesine", karmesine, karmesineFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
registerTinkerMaterial("Mindorite", mindorite, mindoriteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
registerTinkerMaterial("Aardium", aardium, aardiumFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
registerTinkerMaterial("Aardium", aardium, aardiumFluid, 1, 5, 6, 3, 0.8f, 0, 100, true, true);
registerTinkerMaterial("Meteorite", meteorite, meteoriteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
registerTinkerMaterial("Adamantite", adamantite, adamantiteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
registerTinkerMaterial("Vibranium", vibranium, vibraniumFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
@@ -362,6 +362,7 @@ public class ZCompression {
OreDictionary.registerOre("oreAardium", aardiumOre);
OreDictionary.registerOre("ingotAardium", aardiumIngot);
OreDictionary.registerOre("ingotAstrite", astriteIngot);
OreDictionary.registerOre("oreArcanite", arcaniteOre);
OreDictionary.registerOre("ingotArcanite", arcaniteIngot);
OreDictionary.registerOre("oreAdamantite", adamantiteOre);

6
src/main/java/main/util/FuelHandler.java
View File

@@ -1,6 +1,6 @@
package main.util;
import main.ZCompression;
import main.ZTiC;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.IFuelHandler;
import org.apache.commons.lang3.RandomUtils;
@@ -9,10 +9,10 @@ public class FuelHandler implements IFuelHandler {
@Override
public int getBurnTime(ItemStack fuel) {
if (fuel.getItem().equals(ZCompression.lignite)) {
if (fuel.getItem().equals(ZTiC.lignite)) {
return 200 * 2;
}
if (fuel.getItem().equals(ZCompression.fuel_brick)) {
if (fuel.getItem().equals(ZTiC.fuel_brick)) {
return RandomUtils.nextInt(1, RandomUtils.nextInt(1, RandomUtils.nextInt(1, 64))) * 200;
}
return 0;

6
src/main/java/main/util/recipes/Crafting.java
View File

@@ -1,7 +1,7 @@
package main.util.recipes;
import main.ZCompression;
import main.ZTiC;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -12,8 +12,8 @@ public class Crafting {
}
private void register(){
GameRegistry.addShapelessRecipe(new ItemStack(ZCompression.fuel_brick), new Object []{
Items.COAL, Items.COAL, Items.COAL, ZCompression.lignite, ZCompression.lignite, ZCompression.lignite
GameRegistry.addShapelessRecipe(new ItemStack(ZTiC.fuel_brick), new Object[]{
Items.COAL, Items.COAL, Items.COAL, ZTiC.lignite, ZTiC.lignite, ZTiC.lignite
});
}

42
src/main/java/main/util/recipes/Smelting.java
View File

@@ -1,7 +1,7 @@
package main.util.recipes;
import main.ZCompression;
import main.ZTiC;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -13,28 +13,28 @@ public class Smelting {
}
private void register(){
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(new ItemStack(ZCompression.tiberiumShardInstable), new ItemStack(ZCompression.tiberiumShardStable), 0.2F);
GameRegistry.addSmelting(ZTiC.slagironOre, new ItemStack(ZTiC.slagironIngot), 1.0F);
GameRegistry.addSmelting(new ItemStack(ZTiC.slagironIngot, 3), new ItemStack(ZTiC.iron_nugget), 0);
GameRegistry.addSmelting(new ItemStack(ZTiC.slaggoldIngot, 3), new ItemStack(Items.GOLD_NUGGET), 0);
GameRegistry.addSmelting(new ItemStack(ZTiC.tiberiumShardInstable), new ItemStack(ZTiC.tiberiumShardStable), 0.2F);
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.tiberiumShardStable, 2), 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));
GameRegistry.addSmelting(ZTiC.aardiumOre, new ItemStack(ZTiC.aardiumIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.arcaniteOre, new ItemStack(ZTiC.arcaniteIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.adamantiteOre, new ItemStack(ZTiC.adamantiteIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.axiidianOre, new ItemStack(ZTiC.axiidianIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.bismuthOre, new ItemStack(ZTiC.bismuthIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.eterniteOre, new ItemStack(ZTiC.eterniteIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.ignititeOre, new ItemStack(ZTiC.ignititeIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.karmesineOre, new ItemStack(ZTiC.karmesineIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.meteoriteOre, new ItemStack(ZTiC.meteoriteIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.mindoriteOre, new ItemStack(ZTiC.mindoriteIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.mythrilOre, new ItemStack(ZTiC.mythrilIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.palladiumOre, new ItemStack(ZTiC.palladiumIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.prometheumOre, new ItemStack(ZTiC.prometheumIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.tiberiumOre, new ItemStack(ZTiC.tiberiumShardStable, 2), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.vibraniumOre, new ItemStack(ZTiC.vibraniumIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(ZTiC.yrdeanOre, new ItemStack(ZTiC.yrdeanIngot), RandomUtils.nextFloat(0F, 2F));
}
}

44
src/main/java/main/world/ZWorldGen.java
View File

@@ -1,6 +1,6 @@
package main.world;
import main.ZCompression;
import main.ZTiC;
import main.util.Generator;
import net.minecraft.block.BlockStone;
import net.minecraft.init.Blocks;
@@ -13,36 +13,36 @@ 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, 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);
Generator.generateNetherOre(ZTiC.adamantiteOre.getDefaultState(), random, x, z, world, 25, 1, 32, 2, 5);
Generator.generateNetherOre(ZTiC.tiberiumOre.getDefaultState(), random, x, z, world, 60, 1, 128, 2, 7);
Generator.generateNetherOre(ZTiC.palladiumOre.getDefaultState(), random, x, z, world, 21, 32, 64, 2, 5);
Generator.generateOre(ZTiC.prometheumOre.getDefaultState(), random, x, z, world, 21, 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(ZTiC.slagironOre.getDefaultState(), random, x, z, world, 40, 8, 96, 5, 16);
Generator.generateOre(ZTiC.slaggoldOre.getDefaultState(), random, x, z, world, 20, 8, 48, 5, 9);
Generator.generateOre(ZTiC.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, 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(ZTiC.basalt.getDefaultState(), Blocks.LAVA.getDefaultState(), random, x, z, world, 100, 8, 24, 2, 5);
Generator.generateOre(ZTiC.rottenGround.getDefaultState(), Blocks.DIRT.getDefaultState(), random, x, z, world, 25, 50, 70, 2, 15);
Generator.generateOre(ZCompression.vibraniumOre.getDefaultState(), random, x, z, world, 18, 48, 64, 2, 4);
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, 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);
Generator.generateOre(ZTiC.vibraniumOre.getDefaultState(), random, x, z, world, 18, 48, 64, 2, 4);
Generator.generateOre(ZTiC.karmesineOre.getDefaultState(), random, x, z, world, 30, 16, 48, 2, 5);
Generator.generateOre(ZTiC.bismuthOre.getDefaultState(), random, x, z, world, 50, 50, 130, 2, 4);
Generator.generateOre(ZTiC.mythrilOre.getDefaultState(), random, x, z, world, 18, 16, 32, 2, 4);
Generator.generateOre(ZTiC.meteoriteOre.getDefaultState(), random, x, z, world, 12, 0, 32, 2, 10);
Generator.generateOre(ZTiC.mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 200, 16, 96, 2, 4);
Generator.generateOre(ZTiC.arcaniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 200, 16, 96, 2, 4);
Generator.generateOre(ZTiC.eterniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 200, 16, 96, 2, 4);
}
private void end(Random random, int x, int z, World world) {
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);
Generator.generateEndOre(ZTiC.yrdeanOre.getDefaultState(), random, x, z, world, 16, 10, 35, 2, 6);
Generator.generateEndOre(ZTiC.ignititeOre.getDefaultState(), random, x, z, world, 16, 20, 45, 2, 6);
Generator.generateEndOre(ZTiC.axiidianOre.getDefaultState(), random, x, z, world, 16, 30, 55, 2, 6);
Generator.generateEndOre(ZTiC.aardiumOre.getDefaultState(), random, x, z, world, 16, 40, 65, 2, 6);
}

46
src/main/java/proxy/ClientProxy.java
View File

@@ -1,12 +1,12 @@
package proxy;
import main.ZCompression;
import main.ZTiC;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import static main.ZCompression.*;
import static main.ZTiC.*;
public class ClientProxy extends ServerProxy {
@@ -64,26 +64,26 @@ public class ClientProxy extends ServerProxy {
registerItemModel(refractiveBysumIngot);
// 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);
registerBlockModel(ZCompression.mindoriteOre);
registerBlockModel(ZCompression.mythrilOre);
registerBlockModel(ZCompression.palladiumOre);
registerBlockModel(ZCompression.prometheumOre);
registerBlockModel(ZCompression.rottenGround);
registerBlockModel(ZCompression.slagironOre);
registerBlockModel(ZCompression.slaggoldOre);
registerBlockModel(ZCompression.tiberiumOre);
registerBlockModel(ZCompression.vibraniumOre);
registerBlockModel(ZCompression.yrdeanOre);
registerBlockModel(ZTiC.aardiumOre);
registerBlockModel(ZTiC.adamantiteOre);
registerBlockModel(ZTiC.arcaniteOre);
registerBlockModel(ZTiC.axiidianOre);
registerBlockModel(ZTiC.basalt);
registerBlockModel(ZTiC.bismuthOre);
registerBlockModel(ZTiC.eterniteOre);
registerBlockModel(ZTiC.ignititeOre);
registerBlockModel(ZTiC.karmesineOre);
registerBlockModel(ZTiC.ligniteOre);
registerBlockModel(ZTiC.meteoriteOre);
registerBlockModel(ZTiC.mindoriteOre);
registerBlockModel(ZTiC.mythrilOre);
registerBlockModel(ZTiC.palladiumOre);
registerBlockModel(ZTiC.prometheumOre);
registerBlockModel(ZTiC.rottenGround);
registerBlockModel(ZTiC.slagironOre);
registerBlockModel(ZTiC.slaggoldOre);
registerBlockModel(ZTiC.tiberiumOre);
registerBlockModel(ZTiC.vibraniumOre);
registerBlockModel(ZTiC.yrdeanOre);
}
}

6
src/main/resources/assets/zcompression/models/block/astrite_ore.json Normal file
View File

@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "zcompression:blocks/astrite_ore"
}
}

6
src/main/resources/assets/zcompression/models/item/astrite_ingot.json Normal file
View File

@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "zcompression:items/astrite_ingot"
}
}

10
src/main/resources/mcmod.info
View File

@@ -1,13 +1,13 @@
[{
"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.3b",
"modid": "ztic_addon",
"name": "Zkaface Tinkers' Construct Addon",
"description": "A modification for Tinkers' Construct, adding several ores and materials",
"version": "0.4",
"mcversion": "1.9",
"url": "www.sosnitzka.com",
"updateUrl": "",
"authorList": ["Zkaface"],
"credits": "Chefe. He's there, if you need him.",
"credits": "Chefe. He's there, if you need him. Sometimes.",
"logoFile": "",
"screenshots": [],
"dependencies": ["tconstruct"]