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

fixed derp in registerBlocks

Browse Source
This commit is contained in:
Giovanni Harting
2016-05-02 18:02:10 +02:00
parent e6ae3f74f6
commit ec996ab1af
2 changed files with 14 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -22,7 +22,7 @@ repositories {
} }
} }
version = "0.1" version = "0.2"
group = "com.sosnitzka.zcompression" // http://maven.apache.org/guides/mini/guide-naming-conventions.html group = "com.sosnitzka.zcompression" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "zcompression" archivesBaseName = "zcompression"

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

@@ -1,30 +1,10 @@
package main; package main;
import blocks.BlockAardiumOre; import blocks.*;
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;
import blocks.BlockMindoriteOre;
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 blocks.category.BasicBlockOreGlow;
import items.ItemSlagiron; import items.ItemSlagiron;
import main.world.ZWorldGen; import main.world.ZWorldGen;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -40,14 +20,8 @@ public class ZCompression {
static final String MODID = "zcompression"; static final String MODID = "zcompression";
static final String VERSION = "1.0"; static final String VERSION = "1.0";
@SidedProxy(clientSide = "proxy.ClientProxy", serverSide = "proxy.ServerProxy")
private static ServerProxy proxy;
// Items // Items
public static ItemSlagiron slagiron = new ItemSlagiron(); public static ItemSlagiron slagiron = new ItemSlagiron();
//Blocks, esp. for tconstruct //Blocks, esp. for tconstruct
public static BlockAardiumOre aardiumOre = new BlockAardiumOre(); public static BlockAardiumOre aardiumOre = new BlockAardiumOre();
public static BlockAdamantiteOre adamantiteOre = new BlockAdamantiteOre(); public static BlockAdamantiteOre adamantiteOre = new BlockAdamantiteOre();
@@ -70,7 +44,18 @@ public class ZCompression {
public static BlockTiberiumOre tiberiumOre = new BlockTiberiumOre(); public static BlockTiberiumOre tiberiumOre = new BlockTiberiumOre();
public static BlockVibraniumre vibraniumOre = new BlockVibraniumre(); public static BlockVibraniumre vibraniumOre = new BlockVibraniumre();
public static BlockYrdeanOre yrdeanOre = new BlockYrdeanOre(); public static BlockYrdeanOre yrdeanOre = new BlockYrdeanOre();
@SidedProxy(clientSide = "proxy.ClientProxy", serverSide = "proxy.ServerProxy")
private static ServerProxy proxy;
private static void registerBlock(Block 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()));
}
@EventHandler @EventHandler
public void preInit(FMLPreInitializationEvent e) { public void preInit(FMLPreInitializationEvent e) {
@@ -111,15 +96,5 @@ public class ZCompression {
} }
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()));
}
} }