mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 03:49:07 +00:00
remove systematic registration of modules to forge event bus
This commit is contained in:
1 parent
391ba5ef04
commit
fdce1a65b5
4 files changed
+50
-33
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;
|
||||
@@ -130,6 +128,5 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
|
||||
|
||||
protected void addModule(IInitializable init) {
|
||||
modules.add(init);
|
||||
MinecraftForge.EVENT_BUS.register(init);
|
||||
}
|
||||
}
|
||||
@@ -81,9 +81,15 @@ public class BinnieCore extends AbstractMod {
|
||||
addModule(baseManager);
|
||||
}
|
||||
|
||||
MinecraftForge.EVENT_BUS.register(Binnie.Genetics.handler);
|
||||
|
||||
addModule(new ModuleCraftGUI());
|
||||
addModule(new ModuleStorage());
|
||||
|
||||
ModuleItems moduleItems = new ModuleItems();
|
||||
addModule(new ModuleItems());
|
||||
MinecraftForge.EVENT_BUS.register(moduleItems.handler);
|
||||
|
||||
if (Loader.isModLoaded("BuildCraft|Silicon")) {
|
||||
addModule(new ModuleTrigger());
|
||||
}
|
||||
|
||||
@@ -40,11 +40,13 @@ public class ManagerGenetics extends ManagerBase {
|
||||
private final Map<ISpeciesRoot, BreedingSystem> breedingSystems;
|
||||
private final List<IChromosomeType> invalidChromosomeTypes;
|
||||
private final Map<ISpeciesRoot, Map<IChromosomeType, List<IAllele>>> chromosomeArray;
|
||||
public EventHandler handler;
|
||||
|
||||
public ManagerGenetics() {
|
||||
breedingSystems = new LinkedHashMap<>();
|
||||
invalidChromosomeTypes = new ArrayList<>();
|
||||
chromosomeArray = new LinkedHashMap<>();
|
||||
handler = new EventHandler();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -140,11 +142,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 +216,12 @@ public class ManagerGenetics extends ManagerBase {
|
||||
return o1.getUID().compareTo(o2.getUID());
|
||||
}
|
||||
}
|
||||
|
||||
public class EventHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onWorldLoad(WorldEvent.Load event) {
|
||||
refreshData();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -21,6 +21,12 @@ import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class ModuleItems implements IInitializable {
|
||||
|
||||
public EventHandler handler;
|
||||
|
||||
public ModuleItems() {
|
||||
handler = new EventHandler();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
BinnieCore.fieldKit = new ItemFieldKit();
|
||||
@@ -49,36 +55,39 @@ 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;
|
||||
}
|
||||
public class 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)) {
|
||||
@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