Removed own event bus and fully migrated into event-based system.

Author: Abastro

src/main/java/stellarapi/ClientProxy.java

@@ -32,7 +32,7 @@ public void preInit(FMLPreInitializationEvent event) {
 
 		this.overlay = new OverlayHandler();
 
-		MinecraftForge.EVENT_BUS.register(new SAPIClientForgeEventHook(this.overlay));
+		MinecraftForge.EVENT_BUS.register(new SAPIClientEventHook(this.overlay));
 
 		this.guiConfig = new ConfigManager(
 				StellarAPI.getConfiguration(event.getModConfigurationDirectory(), "GuiConfig.cfg"));

…stellarapi/SAPIClientForgeEventHook.java …java/stellarapi/SAPIClientEventHook.javasrc/main/java/stellarapi/SAPIClientForgeEventHook.java renamed to src/main/java/stellarapi/SAPIClientEventHook.java src/main/java/stellarapi/SAPIClientForgeEventHook.java renamed to src/main/java/stellarapi/SAPIClientEventHook.java

@@ -5,33 +5,41 @@
 
 import org.lwjgl.input.Keyboard;
 
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.client.IRenderHandler;
 import net.minecraftforge.client.event.EntityViewRenderEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
+import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.InputEvent.KeyInputEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.relauncher.ReflectionHelper;
+import net.minecraftforge.fml.relauncher.Side;
 import stellarapi.api.ICelestialWorld;
 import stellarapi.api.SAPICapabilities;
-import stellarapi.api.SAPIReferences;
-import stellarapi.api.optics.EyeDetector;
-import stellarapi.api.optics.IOpticalProp;
-import stellarapi.api.optics.NakedFilter;
+import stellarapi.api.event.FilterQEEvent;
+import stellarapi.api.interact.IFilter;
+import stellarapi.api.interact.IScope;
+import stellarapi.api.optics.EnumRGBA;
+import stellarapi.api.optics.Wavelength;
 import stellarapi.api.render.IAdaptiveRenderer;
 import stellarapi.feature.gui.overlay.OverlayHandler;
 import stellarapi.reference.CelestialPackManager;
 
-public class SAPIClientForgeEventHook {
+public class SAPIClientEventHook {
 
 	private static final Field lightMapField = ReflectionHelper.findField(EntityRenderer.class,
 			ObfuscationReflectionHelper.remapFieldNames(EntityRenderer.class.getName(), "lightmapTexture",
@@ -55,9 +63,8 @@ public class SAPIClientForgeEventHook {
 	private KeyBinding focusGuiKey = new KeyBinding("key.stellarapi.focusgui.description", Keyboard.KEY_U,
 			"key.stellarapi");
 
-	public SAPIClientForgeEventHook(OverlayHandler overlay) {
+	public SAPIClientEventHook(OverlayHandler overlay) {
 		ClientRegistry.registerKeyBinding(this.focusGuiKey);
-
 		this.overlay = overlay;
 	}
 
@@ -76,21 +83,54 @@ public void onRenderWorldLast(RenderWorldLastEvent event) {
 	}
 
 	@SubscribeEvent(priority = EventPriority.LOWEST)
-	public void onUpdateFOV(EntityViewRenderEvent.FOVModifier event) {
-		// TODO AA FOV change - manual?
+	public void onDecideFOV(EntityViewRenderEvent.FOVModifier event) {
+		if(event.getEntity() instanceof EntityLivingBase) {
+			EntityLivingBase viewer = (EntityLivingBase) event.getEntity();
+			ItemStack active = viewer.getActiveItemStack();
+			if(active != null) {
+				IScope scope = active.getCapability(SAPICapabilities.SCOPE_CAPABILITY, null);
+				if(scope != null)
+					event.setFOV(scope.transformFOV(event.getFOV()));
+			}
+		}
+	}
+
+	@SubscribeEvent(priority = EventPriority.LOWEST)
+	public void onDecideQE(FilterQEEvent event) {
+		if(event.getEntity() instanceof EntityLivingBase) {
+			EntityLivingBase viewer = (EntityLivingBase) event.getEntity();
+			ItemStack active = viewer.getActiveItemStack();
+			if(active != null) {
+				IFilter filter = active.getCapability(SAPICapabilities.FILTER_CAPABILITY, null);
+				if(filter != null)
+					event.setQE(filter.transformQE(event.getWavelength(), event.getQE()));
+			}
+		}
+	}
+
+
+	private float getFilterQE(EntityViewRenderEvent event, Wavelength wavelengthIn, float initialQE) {
+		return getFilterQE(event.getRenderer(), event.getEntity(), event.getState(), event.getRenderPartialTicks(), wavelengthIn, initialQE);
+	}
+
+	private float getFilterQE(EntityRenderer renderer, Entity entity, IBlockState state, double renderPartialTicks, Wavelength wavelengthIn, float initialQE) {
+		FilterQEEvent event = new FilterQEEvent(renderer, entity, state, renderPartialTicks, wavelengthIn, initialQE);
+		MinecraftForge.EVENT_BUS.post(event);
+		return event.getQE();
 	}
 
 	@SubscribeEvent(priority = EventPriority.LOWEST)
 	public void onDecideFogColor(EntityViewRenderEvent.FogColors event) {
-		IOpticalProp filter = SAPIReferences.getFilter(event.getEntity());
+		//IOpticalProp filter = SAPIReferences.getFilter(event.getEntity());
+		float[] eff = new float[3];
+		for(EnumRGBA color : EnumRGBA.RGB)
+			eff[color.ordinal()] = this.getFilterQE(event, Wavelength.colorWaveMap.get(color), 1.0f);
 
-		double[] value = EyeDetector.getInstance().process(1.0, filter,
-				new double[] { event.getRed(), event.getGreen(), event.getBlue() });
-		event.setRed((float) Math.min(value[0], 1.0));
-		event.setGreen((float) Math.min(value[1], 1.0));
-		event.setBlue((float) Math.min(value[2], 1.0));
+		event.setRed((float) Math.min(event.getRed() * eff[0], 1.0));
+		event.setGreen((float) Math.min(event.getGreen() * eff[1], 1.0));
+		event.setBlue((float) Math.min(event.getBlue() * eff[2], 1.0));
 
-		if (!(filter instanceof NakedFilter)) {
+		if (eff[0] != 1.0f || eff[1] != 1.0f || eff[2] != 1.0f) {
 			DynamicTexture texture;
 			try {
 				texture = (DynamicTexture) lightMapField.get(event.getRenderer());
@@ -101,12 +141,9 @@ public void onDecideFogColor(EntityViewRenderEvent.FogColors event) {
 					int green = ((data & 0x0000ff00) >> 8);
 					int blue = data & 0x000000ff;
 
-					double[] modified = EyeDetector.getInstance().process(1.0, filter,
-							new double[] { red / 255.0, green / 255.0, blue / 255.0 });
-
-					red = Math.min(0xff, (int) (modified[0] * 0xff));
-					green = Math.min(0xff, (int) (modified[1] * 0xff));
-					blue = Math.min(0xff, (int) (modified[2] * 0xff));
+					red = Math.min(0xff, (int) (red * eff[0]));
+					green = Math.min(0xff, (int) (green * eff[1]));
+					blue = Math.min(0xff, (int) (blue * eff[2]));
 
 					texture.getTextureData()[i] = 255 << 24 | red << 16 | green << 8 | blue;
 				}
@@ -130,7 +167,6 @@ public void renderGameOverlay(RenderGameOverlayEvent.Post event) {
 	@SubscribeEvent
 	public void onTick(TickEvent.ClientTickEvent event) {
 		if (event.phase == TickEvent.Phase.START) {
-			//Minecraft mc = Minecraft.getMinecraft();
 			overlay.updateOverlay();
 		}
 	}

…/java/stellarapi/SAPIForgeEventHook.java …java/stellarapi/SAPICommonEventHook.javasrc/main/java/stellarapi/SAPIForgeEventHook.java renamed to src/main/java/stellarapi/SAPICommonEventHook.java src/main/java/stellarapi/SAPIForgeEventHook.java renamed to src/main/java/stellarapi/SAPICommonEventHook.java

@@ -4,10 +4,12 @@
 import net.minecraft.world.World;
 import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;
 import net.minecraftforge.fml.client.event.ConfigChangedEvent;
+import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
 import stellarapi.api.SAPIReferences;
 
-public class SAPIForgeEventHook {
+public class SAPICommonEventHook {
 	@SubscribeEvent
 	public void onSleepInBed(PlayerSleepInBedEvent event) {
 		if (!SAPIReferences.getSleepWakeManager().isEnabled() || event.getEntityPlayer().world.isRemote) {

src/main/java/stellarapi/SAPIOwnEventHook.java

@@ -58,7 +58,7 @@ public static Configuration getConfiguration(File configDir, String subName) {
 
 	private Logger logger;
 
-	private SAPIForgeEventHook eventHook = new SAPIForgeEventHook();
+	private SAPICommonEventHook eventHook = new SAPICommonEventHook();
 	private SAPITickHandler tickHandler = new SAPITickHandler();
 	private StellarAPINetworkManager networkManager = new StellarAPINetworkManager();
 
@@ -118,8 +118,6 @@ public void preInit(FMLPreInitializationEvent event) {
 
 		SAPIReferences.registerPerDimResourceHandler(PerDimensionResourceRegistry.getInstance());
 
-		SAPIReferences.getEventBus().register(new SAPIOwnEventHook());
-
 		PROXY.preInit(event);
 
 		CompatManager.getInstance().onPreInit();

src/main/java/stellarapi/StellarAPI.java

@@ -2,8 +2,17 @@
 
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.CapabilityInject;
+import stellarapi.api.interact.IFilter;
+import stellarapi.api.interact.IScope;
 
 public class SAPICapabilities {
 	@CapabilityInject(ICelestialWorld.class)
 	public static final Capability<ICelestialWorld> CELESTIAL_CAPABILITY = null;
+
+
+	@CapabilityInject(IScope.class)
+	public static final Capability<IScope> SCOPE_CAPABILITY = null;
+
+	@CapabilityInject(IFilter.class)
+	public static final Capability<IFilter> FILTER_CAPABILITY = null;
 }

src/main/java/stellarapi/api/SAPICapabilities.java

@@ -49,8 +49,6 @@ public final class SAPIReferences {
 
 	private PerDimensionResourceManager resourceManager = new PerDimensionResourceManager();
 
-	private EventBus stellarEventBus = new EventBus();
-
 	private static final SAPIReferences INSTANCE = new SAPIReferences();
 
 	/** Getter for the daytime checker. */
@@ -188,13 +186,6 @@ public static void registerPerDimResourceHandler(IPerDimensionResourceHandler ha
 		INSTANCE.resourceManager.register(handler);
 	}
 
-	/**
-	 * Gets the event bus for Stellar API.
-	 */
-	public static EventBus getEventBus() {
-		return INSTANCE.stellarEventBus;
-	}
-
 	/**
 	 * Gets celestial coordinate for certain world.
 	 * <p>

src/main/java/stellarapi/api/SAPIReferences.java

@@ -1,22 +1,28 @@
 package stellarapi.api.event;
 
-import gnu.trove.map.TObjectFloatMap;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.entity.Entity;
+import net.minecraftforge.client.event.EntityViewRenderEvent;
 import stellarapi.api.optics.Wavelength;
 
 /**
  * Event that determines quantum efficiency of filter for an entity.
  * */
-public class FilterQEEvent extends PerEntityEvent {
-	public final Wavelength wavelength;
+public class FilterQEEvent extends EntityViewRenderEvent {
+	private final Wavelength wavelength;
 	private float efficiency;
 
-	public FilterQEEvent(Entity entity, Wavelength wavelengthIn, float initialQE) {
-		super(entity);
+	public FilterQEEvent(EntityRenderer renderer, Entity entity, IBlockState state, double renderPartialTicks, Wavelength wavelengthIn, float initialQE) {
+		super(renderer, entity, state, renderPartialTicks);
 		this.wavelength = wavelengthIn;
 		this.efficiency = initialQE;
 	}
 
+	public Wavelength getWavelength() {
+		return this.wavelength;
+	}
+
 	public float getQE() {
 		return this.efficiency;
 	}