mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 20:22:35 +00:00
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
This commit is contained in:
commit
9d5144ddea
36 files changed
+269
-102
No files matched your search
@@ -1,7 +1,6 @@
|
||||
package binnie.core.mod.parser;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.BinnieCore;
|
||||
import net.minecraft.item.Item;
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
@@ -15,7 +14,7 @@ public class ItemParser extends FieldParser {
|
||||
public void preInit(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
|
||||
final Item item = (Item) field.get(null);
|
||||
if (item != null) {
|
||||
BinnieCore.proxy.registerItem(item);
|
||||
mod.getProxy().registerItem(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,11 +20,13 @@ public class BinnieModProxy implements IBinnieModProxy {
|
||||
this.mod = mod;
|
||||
}
|
||||
|
||||
public Item registerItem(Item item){
|
||||
@Override
|
||||
public Item registerItem(Item item){
|
||||
return GameRegistry.register(item);
|
||||
}
|
||||
|
||||
public Block registerBlock(Block block){
|
||||
@Override
|
||||
public Block registerBlock(Block block){
|
||||
return GameRegistry.register(block);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
package binnie.core.proxy;
|
||||
|
||||
import binnie.core.IInitializable;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
public interface IProxyCore extends IInitializable {
|
||||
|
||||
Item registerItem(Item item);
|
||||
|
||||
Block registerBlock(Block block);
|
||||
}
|
||||
Reference in new issue
Block a user