mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 03:49:07 +00:00
Speed up forge event registration (#64)
Co-authored-by: Alexdoru <[email protected]>
This commit is contained in:
1 parent
5b551eb8ec
commit
39f86c8b0c
9 files changed
+271
-234
No files matched your search
@@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
|
||||
@@ -40,36 +41,12 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
|
||||
designSystem = system;
|
||||
}
|
||||
|
||||
public static int getMetadata(int plank1, int plank2, int design) {
|
||||
return plank1 + (plank2 << 9) + (design << 18);
|
||||
public void registerHandler() {
|
||||
MinecraftForge.EVENT_BUS.register(new EventHandler());
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onClick(PlayerInteractEvent event) {
|
||||
if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
|
||||
return;
|
||||
}
|
||||
|
||||
World world = event.entityPlayer.worldObj;
|
||||
EntityPlayer player = event.entityPlayer;
|
||||
int x = event.x;
|
||||
int y = event.y;
|
||||
int z = event.z;
|
||||
if (!(world.getBlock(x, y, z) instanceof BlockDesign blockDesign)) {
|
||||
return;
|
||||
}
|
||||
|
||||
ItemStack item = player.getHeldItem();
|
||||
if (item == null || !(item.getItem() instanceof IToolHammer)
|
||||
|| !((IToolHammer) item.getItem()).isActive(item)) {
|
||||
return;
|
||||
}
|
||||
|
||||
DesignBlock carpentryBlock = blockDesign.getCarpentryBlock(world, x, y, z);
|
||||
TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z);
|
||||
carpentryBlock.rotate(event.face, item, player, world, x, y, z);
|
||||
int meta = carpentryBlock.getBlockMetadata(blockDesign.getDesignSystem());
|
||||
tile.setTileMetadata(meta, true);
|
||||
public static int getMetadata(int plank1, int plank2, int design) {
|
||||
return plank1 + (plank2 << 9) + (design << 18);
|
||||
}
|
||||
|
||||
public abstract ItemStack getCreativeStack(IDesign design);
|
||||
@@ -160,4 +137,35 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
|
||||
public int getNumberOfPasses() {
|
||||
return 2;
|
||||
}
|
||||
|
||||
public static class EventHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onClick(PlayerInteractEvent event) {
|
||||
if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
|
||||
return;
|
||||
}
|
||||
|
||||
World world = event.entityPlayer.worldObj;
|
||||
EntityPlayer player = event.entityPlayer;
|
||||
int x = event.x;
|
||||
int y = event.y;
|
||||
int z = event.z;
|
||||
if (!(world.getBlock(x, y, z) instanceof BlockDesign blockDesign)) {
|
||||
return;
|
||||
}
|
||||
|
||||
ItemStack item = player.getHeldItem();
|
||||
if (item == null || !(item.getItem() instanceof IToolHammer)
|
||||
|| !((IToolHammer) item.getItem()).isActive(item)) {
|
||||
return;
|
||||
}
|
||||
|
||||
DesignBlock carpentryBlock = blockDesign.getCarpentryBlock(world, x, y, z);
|
||||
TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z);
|
||||
carpentryBlock.rotate(event.face, item, player, world, x, y, z);
|
||||
int meta = carpentryBlock.getBlockMetadata(blockDesign.getDesignSystem());
|
||||
tile.setTileMetadata(meta, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,6 @@ package binnie.extratrees.carpentry;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import binnie.core.BinnieCore;
|
||||
@@ -81,21 +80,18 @@ public class ModuleCarpentry implements IInitializable {
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
// spotless:off
|
||||
ExtraTrees.blockCarpentry = new BlockCarpentry();
|
||||
ExtraTrees.blockPanel = new BlockCarpentryPanel();
|
||||
ExtraTrees.blockStained = new BlockStainedDesign();
|
||||
GameRegistry.registerBlock(ExtraTrees.blockCarpentry, ItemMetadata.class, "carpentry");
|
||||
GameRegistry.registerBlock(ExtraTrees.blockPanel, ItemMetadata.class, "panel");
|
||||
GameRegistry.registerBlock(ExtraTrees.blockStained, ItemMetadata.class, "stainedglass");
|
||||
BinnieCore.proxy.registerCustomItemRenderer(
|
||||
Item.getItemFromBlock(ExtraTrees.blockCarpentry),
|
||||
new MultipassItemRenderer());
|
||||
BinnieCore.proxy.registerCustomItemRenderer(
|
||||
Item.getItemFromBlock(ExtraTrees.blockStained),
|
||||
new MultipassItemRenderer());
|
||||
MinecraftForge.EVENT_BUS.register(ExtraTrees.blockCarpentry);
|
||||
BinnieCore.proxy
|
||||
.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer());
|
||||
BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockCarpentry), new MultipassItemRenderer());
|
||||
BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockStained), new MultipassItemRenderer());
|
||||
ExtraTrees.blockCarpentry.registerHandler();
|
||||
BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer());
|
||||
// spotless:on
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user