Jotunn/TAIGA-Obsidiorite-Heroic-Fixes
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

general code cleanup

Browse Source
This commit is contained in:
Giovanni Harting
2016-05-03 18:28:49 +02:00
parent 5ef97bbcf1
commit 086faefd23
38 changed files with 76 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@@ -20,6 +20,7 @@ repositories {
name = "chickenbones"
url = "http://chickenbones.net/maven/"
}
maven {
name 'DVS1 Maven FS'
url 'http://dvs1.progwml6.com/files/maven'

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

@@ -24,8 +24,7 @@ public class BlockLigniteOre extends BasicBlockOre {
int r = RANDOM.nextInt(11);
if (r > 7) {
return MathHelper.getRandomIntegerInRange(rand, 0, 10) + fortune;
}
else return 0;
} else return 0;
}
@Override

1
src/main/java/main/ZCompression.java
View File

@@ -134,7 +134,6 @@ public class ZCompression {
GameRegistry.registerFuelHandler(new FuelHandler());
new Smelting();
new Crafting();
}
@EventHandler

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

@@ -24,11 +24,9 @@ public class ZWorldGen implements IWorldGenerator {
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, 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, 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);

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

@@ -8,6 +8,14 @@ import net.minecraft.item.Item;
public class ClientProxy extends ServerProxy {
private static void registerBlockModel(Block block) {
registerItemModel(Item.getItemFromBlock(block));
}
private static void registerItemModel(Item item) {
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory"));
}
@Override
public void registerClientStuff() {
// Items
@@ -56,15 +64,5 @@ public class ClientProxy extends ServerProxy {
registerBlockModel(ZCompression.tiberiumOre);
registerBlockModel(ZCompression.vibraniumOre);
registerBlockModel(ZCompression.yrdeanOre);
}
private static void registerBlockModel(Block block) {
registerItemModel(Item.getItemFromBlock(block));
}
private static void registerItemModel(Item item) {
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory"));
}
}