summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiovanni Harting <539@idlegandalf.com>2016-05-03 18:13:46 +0200
committerGiovanni Harting <539@idlegandalf.com>2016-05-03 18:22:23 +0200
commit5ef97bbcf16bedbf04c9092e3d58d897ed5e4a82 (patch)
tree61b42075960089ef024a70aaee75b10e5ce8e3eb
parent8e198254467d22bfe72d23a91cb1acfbe25761b2 (diff)
added JEI
removed some redudant code
-rw-r--r--build.gradle25
-rw-r--r--src/main/java/main/ZCompression.java60
2 files changed, 29 insertions, 56 deletions
diff --git a/build.gradle b/build.gradle
index 958e99e..3a62b97 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,10 @@ repositories {
name = "chickenbones"
url = "http://chickenbones.net/maven/"
}
+ maven {
+ name 'DVS1 Maven FS'
+ url 'http://dvs1.progwml6.com/files/maven'
+ }
}
version = "0.3b"
@@ -40,30 +44,11 @@ minecraft {
}
dependencies {
- // you may put jars on which you depend on in ./libs
- // or you may define them like so..
- //compile "some.group:artifact:version:classifier"
- //compile "some.group:artifact:version"
-
deobfCompile "codechicken:CodeChickenLib:1.9-2.0.1.21:deobf"
deobfCompile "codechicken:CodeChickenCore:1.9-2.0.1.53:deobf"
//deobfCompile "codechicken:NotEnoughItems:1.9-${nei_version}:dev"
- // real examples
- //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
- //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
- // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
- //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
- // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
- // except that these dependencies get remapped to your current MCP mappings
- //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
- //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
- // for more info...
- // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
- // http://www.gradle.org/docs/current/userguide/dependency_management.html
+ deobfCompile "mezz.jei:jei_1.9:3.3.3.197"
// compile "tconstruct:TConstruct:1.9-2.2.2.jenkins159:deobf"
}
diff --git a/src/main/java/main/ZCompression.java b/src/main/java/main/ZCompression.java
index db1d743..e5aa87b 100644
--- a/src/main/java/main/ZCompression.java
+++ b/src/main/java/main/ZCompression.java
@@ -1,7 +1,6 @@
package main;
import blocks.*;
-import blocks.category.BasicBlockOreGlow;
import items.*;
import main.util.FuelHandler;
import main.util.recipes.Crafting;
@@ -34,7 +33,7 @@ public class ZCompression {
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 ItemBismuthIngot bismuthIngot = new ItemBismuthIngot();
public static ItemEterniteIngot eterniteIngot = new ItemEterniteIngot();
public static ItemIgnititeIngot ignititeIngot = new ItemIgnititeIngot();
public static ItemKarmesineIngot karmesineIngot = new ItemKarmesineIngot();
@@ -72,12 +71,7 @@ public class ZCompression {
@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) {
+ private static void registerBlockWithItem(Block block) {
GameRegistry.register(block);
GameRegistry.register(new ItemBlock(block).setRegistryName(block.getRegistryName()));
}
@@ -109,32 +103,28 @@ public class ZCompression {
GameRegistry.register(yrdeanIngot);
-
//Blocks
- registerBlock(aardiumOre);
- registerBlock(adamantiteOre);
- registerBlock(arcaniteOre);
- registerBlock(axiidianOre);
- registerBlock(basalt);
- registerBlock(bismuthOre);
- registerBlock(eterniteOre);
- registerBlock(ignititeOre);
- registerBlock(karmesineOre);
- registerBlock(ligniteOre);
- registerBlock(meteoriteOre);
- registerBlock(mindoriteOre);
- registerBlock(mythrilOre);
- registerBlock(palladiumOre);
- registerBlock(prometheumOre);
- registerBlock(rottenGround);
- registerBlock(slagironOre);
- registerBlock(slaggoldOre);
- registerBlock(tiberiumOre);
- registerBlock(vibraniumOre);
- registerBlock(yrdeanOre);
-
-
-
+ registerBlockWithItem(aardiumOre);
+ registerBlockWithItem(adamantiteOre);
+ registerBlockWithItem(arcaniteOre);
+ registerBlockWithItem(axiidianOre);
+ registerBlockWithItem(basalt);
+ registerBlockWithItem(bismuthOre);
+ registerBlockWithItem(eterniteOre);
+ registerBlockWithItem(ignititeOre);
+ registerBlockWithItem(karmesineOre);
+ registerBlockWithItem(ligniteOre);
+ registerBlockWithItem(meteoriteOre);
+ registerBlockWithItem(mindoriteOre);
+ registerBlockWithItem(mythrilOre);
+ registerBlockWithItem(palladiumOre);
+ registerBlockWithItem(prometheumOre);
+ registerBlockWithItem(rottenGround);
+ registerBlockWithItem(slagironOre);
+ registerBlockWithItem(slaggoldOre);
+ registerBlockWithItem(tiberiumOre);
+ registerBlockWithItem(vibraniumOre);
+ registerBlockWithItem(yrdeanOre);
}
@EventHandler
@@ -151,6 +141,4 @@ public class ZCompression {
public void postInit(FMLPostInitializationEvent e) {
}
-
-
-}
+} \ No newline at end of file