mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 20:52:22 +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
@@ -6,8 +6,6 @@ import java.util.Collections;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
import binnie.core.gui.IBinnieGUID;
|
||||
import binnie.core.mod.parser.FieldParser;
|
||||
import binnie.core.network.BinniePacketHandler;
|
||||
@@ -29,7 +27,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
|
||||
fields = new LinkedHashSet<>();
|
||||
modules = new ArrayList<>();
|
||||
BinnieCore.registerMod(this);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
public boolean isActive() {
|
||||
@@ -131,6 +128,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
|
||||
|
||||
protected void addModule(IInitializable init) {
|
||||
modules.add(init);
|
||||
MinecraftForge.EVENT_BUS.register(init);
|
||||
init.registerEventHandler();
|
||||
}
|
||||
}
|
||||
@@ -5,9 +5,9 @@ import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.block.MultipassBlockRenderer;
|
||||
@@ -69,6 +69,10 @@ public class BinnieCore extends AbstractMod {
|
||||
public static ItemGenesis genesis;
|
||||
public static ItemFieldKit fieldKit;
|
||||
|
||||
public BinnieCore() {
|
||||
MinecraftForge.EVENT_BUS.register(new EventHandler());
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
for (ManagerBase baseManager : Binnie.Managers) {
|
||||
@@ -161,23 +165,6 @@ public class BinnieCore extends AbstractMod {
|
||||
return list;
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) {
|
||||
try {
|
||||
EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager()
|
||||
.func_152612_a(event.username.getName());
|
||||
if (player == null) {
|
||||
return;
|
||||
}
|
||||
event.tracker.synchToPlayer(player);
|
||||
NBTTagCompound nbt = new NBTTagCompound();
|
||||
nbt.setString("species", event.species.getUID());
|
||||
} catch (Exception ex) {
|
||||
// ignored
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getChannel() {
|
||||
return "BIN";
|
||||
@@ -198,15 +185,6 @@ public class BinnieCore extends AbstractMod {
|
||||
return BinnieCorePacketID.values();
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void handleTextureRemap(TextureStitchEvent.Pre event) {
|
||||
if (event.map.getTextureType() == 0) {
|
||||
Binnie.Liquid.reloadIcons(event.map);
|
||||
}
|
||||
Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Class<? extends BinniePacketHandler> getPacketHandler() {
|
||||
return PacketHandler.class;
|
||||
@@ -223,4 +201,31 @@ public class BinnieCore extends AbstractMod {
|
||||
super(instance);
|
||||
}
|
||||
}
|
||||
|
||||
public static class EventHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) {
|
||||
try {
|
||||
EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager()
|
||||
.func_152612_a(event.username.getName());
|
||||
if (player == null) {
|
||||
return;
|
||||
}
|
||||
event.tracker.synchToPlayer(player);
|
||||
} catch (Exception ex) {
|
||||
// ignored
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void handleTextureRemap(TextureStitchEvent.Pre event) {
|
||||
if (event.map.getTextureType() == 0) {
|
||||
Binnie.Liquid.reloadIcons(event.map);
|
||||
}
|
||||
Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,4 +7,6 @@ public interface IInitializable {
|
||||
void init();
|
||||
|
||||
void postInit();
|
||||
|
||||
default void registerEventHandler() {}
|
||||
}
|
||||
@@ -57,7 +57,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
|
||||
|
||||
public BreedingSystem() {
|
||||
Binnie.Genetics.registerBreedingSystem(this);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
MinecraftForge.EVENT_BUS.register(new EventHandler());
|
||||
}
|
||||
|
||||
public String getChromosomeName(IChromosomeType chromo) {
|
||||
@@ -294,13 +294,16 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
|
||||
|
||||
public abstract Class<? extends IBreedingTracker> getTrackerClass();
|
||||
|
||||
@SubscribeEvent
|
||||
public void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) {
|
||||
IBreedingTracker tracker = event.tracker;
|
||||
if (!getTrackerClass().isInstance(tracker)) {
|
||||
return;
|
||||
public class EventHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) {
|
||||
IBreedingTracker tracker = event.tracker;
|
||||
if (!getTrackerClass().isInstance(tracker)) {
|
||||
return;
|
||||
}
|
||||
syncTracker(tracker);
|
||||
}
|
||||
syncTracker(tracker);
|
||||
}
|
||||
|
||||
public void syncTracker(IBreedingTracker tracker) {
|
||||
|
||||
@@ -9,6 +9,7 @@ import java.util.Map;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.world.WorldEvent;
|
||||
|
||||
import binnie.Binnie;
|
||||
@@ -67,6 +68,11 @@ public class ManagerGenetics extends ManagerBase {
|
||||
refreshData();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerEventHandler() {
|
||||
MinecraftForge.EVENT_BUS.register(new EventHandler());
|
||||
}
|
||||
|
||||
public ITreeRoot getTreeRoot() {
|
||||
return (ITreeRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees");
|
||||
}
|
||||
@@ -140,11 +146,6 @@ public class ManagerGenetics extends ManagerBase {
|
||||
return (system == null) ? null : system.getConversion(stack);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onWorldLoad(WorldEvent.Load event) {
|
||||
refreshData();
|
||||
}
|
||||
|
||||
private void refreshData() {
|
||||
loadAlleles();
|
||||
for (BreedingSystem system : Binnie.Genetics.getActiveSystems()) {
|
||||
@@ -219,4 +220,12 @@ public class ManagerGenetics extends ManagerBase {
|
||||
return o1.getUID().compareTo(o2.getUID());
|
||||
}
|
||||
}
|
||||
|
||||
public class EventHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onWorldLoad(WorldEvent.Load event) {
|
||||
refreshData();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
|
||||
import binnie.botany.Botany;
|
||||
@@ -49,36 +50,44 @@ public class ModuleItems implements IInitializable {
|
||||
new ItemStack(Items.dye, 1));
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onUseFieldKit(PlayerInteractEvent event) {
|
||||
if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
|
||||
return;
|
||||
}
|
||||
@Override
|
||||
public void registerEventHandler() {
|
||||
MinecraftForge.EVENT_BUS.register(new EventHandler());
|
||||
}
|
||||
|
||||
EntityPlayer player = event.entityPlayer;
|
||||
if (player != null && player.getHeldItem() != null
|
||||
&& player.getHeldItem().getItem() == BinnieCore.fieldKit
|
||||
&& player.isSneaking()) {
|
||||
TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
|
||||
if (!(tile instanceof TileEntityFlower tileFlower)) {
|
||||
public static class EventHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onUseFieldKit(PlayerInteractEvent event) {
|
||||
if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
|
||||
return;
|
||||
}
|
||||
|
||||
IFlower flower = tileFlower.getFlower();
|
||||
if (flower == null) {
|
||||
return;
|
||||
}
|
||||
EntityPlayer player = event.entityPlayer;
|
||||
if (player != null && player.getHeldItem() != null
|
||||
&& player.getHeldItem().getItem() == BinnieCore.fieldKit
|
||||
&& player.isSneaking()) {
|
||||
TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
|
||||
if (!(tile instanceof TileEntityFlower tileFlower)) {
|
||||
return;
|
||||
}
|
||||
|
||||
NBTTagCompound info = new NBTTagCompound();
|
||||
info.setString("Species", flower.getGenome().getPrimary().getUID());
|
||||
info.setString("Species2", flower.getGenome().getSecondary().getUID());
|
||||
info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan());
|
||||
info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID());
|
||||
info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID());
|
||||
info.setBoolean("Wilting", flower.isWilted());
|
||||
info.setBoolean("Flowered", flower.hasFlowered());
|
||||
Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FieldKit.ordinal(), info), event.entityPlayer);
|
||||
event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
|
||||
IFlower flower = tileFlower.getFlower();
|
||||
if (flower == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
NBTTagCompound info = new NBTTagCompound();
|
||||
info.setString("Species", flower.getGenome().getPrimary().getUID());
|
||||
info.setString("Species2", flower.getGenome().getSecondary().getUID());
|
||||
info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan());
|
||||
info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID());
|
||||
info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID());
|
||||
info.setBoolean("Wilting", flower.isWilted());
|
||||
info.setBoolean("Flowered", flower.hasFlowered());
|
||||
Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FieldKit.ordinal(), info), event.entityPlayer);
|
||||
event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user