From 6031efd3a159c34f408b42bb18090abcbe56b2fa Mon Sep 17 00:00:00 2001 From: brandon3055 Date: Wed, 5 Aug 2015 12:29:06 +1000 Subject: [PATCH] Reactor work in progress --- .gitignore | 1 + Change Log.txt | 11 +- .../api/IExtendedRFStorage.java | 7 + .../draconicevolution/api/package-info.java | 2 +- .../draconicevolution/client/ClientProxy.java | 39 ++- .../client/gui/GuiHandler.java | 15 ++ .../client/gui/GuiTextureButton.java | 1 - .../client/gui/componentguis/GUIManual.java | 4 +- .../client/gui/componentguis/GUIReactor.java | 126 ++++++++++ .../gui/componentguis/GUIToolConfig.java | 4 +- .../gui/componentguis/GUIToolInventory.java | 4 +- .../gui/guicomponents/ComponentButton.java | 2 +- .../guicomponents/ComponentTextureButton.java | 54 +++++ .../client/gui/guicomponents/GUIBase.java | 2 +- .../client/handler/ResourceHandler.java | 22 +- .../model/ModelReactorEnergyInjector.java | 185 +++++++++++++++ .../model/ModelReactorStabilizerRing.java | 2 + .../render/block/RenderReactorCore.java | 40 ++++ .../block/RenderReactorEnergyInjector.java | 40 ++++ .../render/block/RenderReactorStabilizer.java | 45 ++++ .../render/particle/ParticleReactorBeam.java | 224 ++++++++++++++++++ .../render/tile/RenderTileEnergyInfiser.java | 9 - .../render/tile/RenderTileEnergyPylon.java | 2 +- .../render/tile/RenderTileReactorCore.java | 50 +++- .../tile/RenderTileReactorEnergyInjector.java | 45 ++++ .../tile/RenderTileReactorStabilizer.java | 127 +++++----- .../draconicevolution/common/CommonProxy.java | 12 +- .../draconicevolution/common/ModBlocks.java | 2 + .../common/blocks/CustomSpawner.java | 7 + .../common/blocks/multiblock/IIsSlave.java | 14 ++ .../multiblock/InvisibleMultiblock.java | 2 +- .../blocks/multiblock/MultiblockHelper.java | 78 +++++- .../common/blocks/multiblock/ReactorCore.java | 22 ++ .../multiblock/ReactorEnergyInjector.java | 101 ++++++++ .../blocks/multiblock/ReactorStabilizer.java | 19 +- .../common/container/ContainerReactor.java | 167 +++++++++++++ .../common/handler/CraftingHandler.java | 68 +++--- .../common/inventory/GenericInventory.java | 99 ++++++++ .../tileentities/CustomSpawnerBaseLogic.java | 8 + .../common/tileentities/TileGrinder.java | 2 +- .../multiblocktiles/TileEnergyPylon.java | 10 + .../TileEnergyStorageCore.java | 55 ++--- .../reactor/TileReactorCore.java | 195 ++++++++++++++- .../reactor/TileReactorEnergyInjector.java | 150 ++++++++++++ .../reactor/TileReactorStabilizer.java | 76 +++++- .../assets/draconicevolution/lang/en_US.lang | 16 ++ .../textures/gui/Reactor.png | Bin 0 -> 23187 bytes .../textures/gui/Widgets.png | Bin 5223 -> 7267 bytes .../models/ModelReactorPowerInjector.png | Bin 0 -> 5560 bytes .../textures/particle/reactorBeam.png | Bin 0 -> 4815 bytes .../textures/particle/reactorBeam.png.mcmeta | 1 + .../textures/particle/reactorEnergyBeam.png | Bin 0 -> 396 bytes .../particle/reactorEnergyBeam.png.mcmeta | 1 + 53 files changed, 1993 insertions(+), 175 deletions(-) create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIReactor.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentTextureButton.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/model/ModelReactorEnergyInjector.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderReactorCore.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderReactorEnergyInjector.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderReactorStabilizer.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleReactorBeam.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileReactorEnergyInjector.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/IIsSlave.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorEnergyInjector.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/container/ContainerReactor.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/inventory/GenericInventory.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorEnergyInjector.java create mode 100644 src/main/resources/assets/draconicevolution/textures/gui/Reactor.png create mode 100644 src/main/resources/assets/draconicevolution/textures/models/ModelReactorPowerInjector.png create mode 100644 src/main/resources/assets/draconicevolution/textures/particle/reactorBeam.png create mode 100644 src/main/resources/assets/draconicevolution/textures/particle/reactorBeam.png.mcmeta create mode 100644 src/main/resources/assets/draconicevolution/textures/particle/reactorEnergyBeam.png create mode 100644 src/main/resources/assets/draconicevolution/textures/particle/reactorEnergyBeam.png.mcmeta diff --git a/.gitignore b/.gitignore index 18331dcb..358e0cdc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ ## ForgeGradle /run +/runClean ## eclipse /eclipse diff --git a/Change Log.txt b/Change Log.txt index d51c2960..37e1e7c1 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -8,7 +8,14 @@ -removed old debug code from bow. -fixed energy crystal name localisation in hud. -crystal binder can now rotate blocks. --fixed weapon aoe not using power. +-fixed weapon aoe not using power. +-fixed rendering error caused by the energy infuser. +-fixed draconium dust not smeltable in TE redstone furnace. +-fixed game freezing for a few seconds on startup. +-energy core now stores its energy value as a long (fixes potential issues) +-added draconium and awakened draconium blocks to the ore dictionary. +-implemented ore dictionary in recipes. +-spawner blacklist config now actually works on the spawner as well as opposed to just preventing the soul drops. ######## 1.0.1-Bugfix-c ######## -fixed crash when arrow from DE bow hits RFTools force field. @@ -75,7 +82,7 @@ -added support for other mods to add recipes to the draconium chest. -fixed arrows bouncing off of dragons... oops. -non fuel items such as empty buckets can now be extracted from the generator. --fixed charging exployt with draconium blocks. +-fixed charging exploit with draconium blocks. -added block break event to aoe mining tools. -added comparator output to the energy pylon. -changed. Pylons can now be placed up to 16 blocks above and bellow the core. diff --git a/src/main/java/com/brandon3055/draconicevolution/api/IExtendedRFStorage.java b/src/main/java/com/brandon3055/draconicevolution/api/IExtendedRFStorage.java index da4afa47..2cf215f0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/api/IExtendedRFStorage.java +++ b/src/main/java/com/brandon3055/draconicevolution/api/IExtendedRFStorage.java @@ -5,7 +5,14 @@ package com.brandon3055.draconicevolution.api; */ public interface IExtendedRFStorage { + /**I will probably leave these here forever but i highly recommend switching as i may remove then at some point.*/ + @Deprecated double getEnergyStored(); + @Deprecated double getMaxEnergyStored(); + + long getExtendedStorage(); + + long getExtendedCapacity(); } diff --git a/src/main/java/com/brandon3055/draconicevolution/api/package-info.java b/src/main/java/com/brandon3055/draconicevolution/api/package-info.java index 1983be24..e8f8fa4a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/api/package-info.java +++ b/src/main/java/com/brandon3055/draconicevolution/api/package-info.java @@ -1,7 +1,7 @@ /** * Created by Brandon on 19/03/2015. */ -@API(apiVersion = "1.0", owner = "DraconicEvolution", provides = "DraconicEvolution|API") +@API(apiVersion = "1.1", owner = "DraconicEvolution", provides = "DraconicEvolution|API") package com.brandon3055.draconicevolution.api; import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java index 28d999ed..f6445d49 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java @@ -14,10 +14,12 @@ import com.brandon3055.draconicevolution.client.render.item.RenderBow; import com.brandon3055.draconicevolution.client.render.item.RenderMobSoul; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyBeam; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; +import com.brandon3055.draconicevolution.client.render.particle.ParticleReactorBeam; import com.brandon3055.draconicevolution.client.render.tile.*; import com.brandon3055.draconicevolution.common.CommonProxy; import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.blocks.multiblock.IIsSlave; import com.brandon3055.draconicevolution.common.entity.EntityCustomDragon; import com.brandon3055.draconicevolution.common.entity.EntityDragonHeart; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; @@ -29,6 +31,7 @@ import com.brandon3055.draconicevolution.common.tileentities.energynet.TileWirel import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyPylon; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyStorageCore; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorCore; +import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorEnergyInjector; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorStabilizer; import com.brandon3055.draconicevolution.common.utills.UpdateChecker; import cpw.mods.fml.client.FMLClientHandler; @@ -41,6 +44,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; @@ -118,13 +122,14 @@ public class ClientProxy extends CommonProxy { KeyBindings.init(); registerRenderIDs(); registerRendering(); + ResourceHandler.instance.tick(null); } @Override public void postInit(FMLPostInitializationEvent event) { super.postInit(event); - + ResourceHandler.instance.tick(null); } public void registerRendering() @@ -137,6 +142,9 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.particleGenerator), new RenderParticleGen()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.energyInfuser), new RenderEnergyInfuser()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.energyCrystal), new RenderCrystal()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.reactorStabilizer), new RenderReactorStabilizer()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.reactorEnergyInjector), new RenderReactorEnergyInjector()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.reactorCore), new RenderReactorCore()); //ISimpleBlockRendering RenderingRegistry.registerBlockHandler(new RenderTeleporterStand()); @@ -158,6 +166,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileWirelessEnergyTransceiver.class, new RenderTileCrystal()); ClientRegistry.bindTileEntitySpecialRenderer(TileReactorCore.class, new RenderTileReactorCore()); ClientRegistry.bindTileEntitySpecialRenderer(TileReactorStabilizer.class, new RenderTileReactorStabilizer()); + ClientRegistry.bindTileEntitySpecialRenderer(TileReactorEnergyInjector.class, new RenderTileReactorEnergyInjector()); //Entitys RenderingRegistry.registerEntityRenderingHandler(EntityCustomDragon.class, new RenderDragon()); @@ -223,6 +232,34 @@ public class ClientProxy extends CommonProxy { return beam; } + @Override + public ParticleReactorBeam reactorBeam(TileEntity tile, ParticleReactorBeam oldBeam, boolean render) { + if (!tile.getWorldObj().isRemote || !(tile instanceof IIsSlave)) return null; + ParticleReactorBeam beam = oldBeam; + boolean inRange = ParticleHandler.isInRange(tile.xCoord, tile.yCoord, tile.zCoord, 50); + + if (beam == null || beam.isDead) + { + if (inRange) + { + beam = new ParticleReactorBeam(tile); + + FMLClientHandler.instance().getClient().effectRenderer.addEffect(beam); + } + } + else if (!inRange) + { + beam.setDead(); + return null; + } + else + { + beam.update(render); + } + return beam; + } + + public boolean isOp(String paramString) { return Minecraft.getMinecraft().theWorld.getWorldInfo().getGameType().isCreative(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java index 3313908e..2d9c97a4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java @@ -2,11 +2,13 @@ package com.brandon3055.draconicevolution.client.gui; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.gui.componentguis.GUIManual; +import com.brandon3055.draconicevolution.client.gui.componentguis.GUIReactor; import com.brandon3055.draconicevolution.client.gui.componentguis.GUIToolConfig; import com.brandon3055.draconicevolution.common.container.*; import com.brandon3055.draconicevolution.common.inventory.InventoryTool; import com.brandon3055.draconicevolution.common.tileentities.*; import com.brandon3055.draconicevolution.common.tileentities.gates.TileGate; +import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorCore; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; import net.minecraft.entity.player.EntityPlayer; @@ -28,6 +30,7 @@ public class GuiHandler implements IGuiHandler { public static final int GUIID_DRACONIC_CHEST = 11; public static final int GUIID_TOOL_CONFIG = 12; public static final int GUIID_FLOW_GATE = 13; + public static final int GUIID_REACTOR = 14; public static final int GUIID_CONTAINER_TEMPLATE = 100; public GuiHandler() { @@ -85,6 +88,12 @@ public class GuiHandler implements IGuiHandler { return new ContainerDraconiumChest(player.inventory, (TileDraconiumChest) containerChest); } break; + case GUIID_REACTOR: + TileEntity reactor = world.getTileEntity(x, y, z); + if (reactor != null && reactor instanceof TileReactorCore) { + return new ContainerReactor(player, (TileReactorCore) reactor); + } + break; case GUIID_TOOL_CONFIG: return new ContainerAdvTool(player.inventory, new InventoryTool(player, null)); @@ -159,6 +168,12 @@ public class GuiHandler implements IGuiHandler { return new GUIDraconiumChest(player.inventory, (TileDraconiumChest) containerChest); } break; + case GUIID_REACTOR: + TileEntity reactor = world.getTileEntity(x, y, z); + if (reactor != null && reactor instanceof TileReactorCore) { + return new GUIReactor(player, (TileReactorCore) reactor, new ContainerReactor(player, (TileReactorCore) reactor)); + } + break; case GUIID_TOOL_CONFIG: return new GUIToolConfig(player, new ContainerAdvTool(player.inventory, new InventoryTool(player, null))); case GUIID_FLOW_GATE: diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiTextureButton.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiTextureButton.java index b32e5ff2..93efe5c7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiTextureButton.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiTextureButton.java @@ -25,7 +25,6 @@ public class GuiTextureButton extends GuiButton { if (this.visible) { FontRenderer fontrenderer = mc.fontRenderer; -// mc.getTextureManager().bindTexture(buttonTextures); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.field_146123_n = x >= this.xPosition && y >= this.yPosition && x < this.xPosition + this.width && y < this.yPosition + this.height; int k = this.getHoverState(this.field_146123_n); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java index 202d4258..e261612d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java @@ -115,8 +115,8 @@ public class GUIManual extends GUIScrollingBase { } @Override - public void buttonClicked(int id) { - super.buttonClicked(id); + public void buttonClicked(int id, int button) { + super.buttonClicked(id, button); if (id == 0) { collection.setOnlyGroupEnabled(GR_BACKGROUND); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIReactor.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIReactor.java new file mode 100644 index 00000000..ac51d3dc --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIReactor.java @@ -0,0 +1,126 @@ +package com.brandon3055.draconicevolution.client.gui.componentguis; + +import com.brandon3055.brandonscore.client.utills.GuiHelper; +import com.brandon3055.draconicevolution.client.gui.guicomponents.*; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; +import com.brandon3055.draconicevolution.common.container.ContainerReactor; +import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorCore; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by brandon3055 on 30/7/2015. + */ +public class GUIReactor extends GUIBase { + private TileReactorCore reactor; + private ContainerReactor container; + + public GUIReactor(EntityPlayer player, TileReactorCore reactor, ContainerReactor container) { + super(container, 248, 222); + this.reactor = reactor; + this.container = container; + } + + @Override + protected ComponentCollection assembleComponents() { + collection = new ComponentCollection(0, 0, 248, 222, this); + collection.addComponent(new ComponentTexturedRect(0, 0, xSize, ySize, ResourceHandler.getResource("textures/gui/Reactor.png"))); + collection.addComponent(new ComponentTextureButton(14, 190, 18, 54, 18, 18, 0, this, "", StatCollector.translateToLocal("button.de.reactorStart.txt"), ResourceHandler.getResource("textures/gui/Widgets.png"))).setName("ACTIVATE"); + collection.addComponent(new ComponentTextureButton(216, 190, 18, 108, 18, 18, 1, this, "", StatCollector.translateToLocal("button.de.reactorStop.txt"), ResourceHandler.getResource("textures/gui/Widgets.png"))).setName("DEACTIVATE"); + return collection; + } + + @Override + protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) {//todo tool tips + super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY); + //Draw I/O Slots + if (reactor.reactorState == TileReactorCore.STATE_OFFLINE){ + RenderHelper.enableGUIStandardItemLighting(); + drawTexturedModalRect(guiLeft + 14, guiTop + 139, 14, ySize, 18, 18); + drawTexturedModalRect(guiLeft + 216, guiTop + 139, 32, ySize, 18, 18); + + fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.insert.txt"), guiLeft + 8, guiTop + 159, 0); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.fuel.txt"), guiLeft + 13, guiTop + 168, 0); + + fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.extract.txt"), guiLeft + 206, guiTop + 159, 0); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.fuel.txt"), guiLeft + 215, guiTop + 168, 0); + } + drawCenteredString(fontRendererObj, "Draconic Reactor", guiLeft + xSize / 2, guiTop + 4, 0x00FFFF); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + ResourceHandler.bindResource("textures/gui/Reactor.png"); + + //Draw Indicators + double value = reactor.reactionTemperature / reactor.maxReactTemperature; + int pixOffset = (int)(value * 108); + drawTexturedModalRect(11, 112 - pixOffset, 0, 222, 14, 5); + + value = reactor.fieldCharge / reactor.maxFieldCharge; + pixOffset = (int)(value * 108); + drawTexturedModalRect(35, 112 - pixOffset, 0, 222, 14, 5); + + value = (double)reactor.energySaturation / (double)reactor.maxEnergySaturation; + pixOffset = (int)(value * 108); + drawTexturedModalRect(199, 112 - pixOffset, 0, 222, 14, 5); + + value = (double)reactor.convertedFuel / (double)reactor.reactorFuel; + pixOffset = (int)(value * 108); + drawTexturedModalRect(223, 112 - pixOffset, 0, 222, 14, 5); + + double fuelM2 = Math.round((double)reactor.reactorFuel / 1296D * 1000D) / 1000D; + fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.coreMass.txt") + ": " + fuelM2 + "m³", 5, 130, 0); + String status = StatCollector.translateToLocal("gui.de.status.txt")+": " + (reactor.reactorState == 0 ? EnumChatFormatting.DARK_GRAY : reactor.reactorState == 1 ? EnumChatFormatting.RED : reactor.reactorState == 2 ? EnumChatFormatting.GREEN : EnumChatFormatting.RED) + StatCollector.translateToLocal("gui.de.status"+reactor.reactorState+".txt"); + fontRendererObj.drawString(status, xSize - 5 - fontRendererObj.getStringWidth(status), 130, 0); + + } + + @Override + public void drawScreen(int mouseX, int mouseY, float par3) { + super.drawScreen(mouseX, mouseY, par3); + List text = new ArrayList(); + if (GuiHelper.isInRect(9, 4, 18, 144, mouseX - guiLeft, mouseY - guiTop)){ + text.add(StatCollector.translateToLocal("gui.de.reactionTemp.txt")); + text.add((int)reactor.reactionTemperature + "°C"); + drawHoveringText(text, mouseX, mouseY, fontRendererObj); + } + else if (GuiHelper.isInRect(33, 4, 18, 144, mouseX-guiLeft, mouseY-guiTop)){ + text.add(StatCollector.translateToLocal("gui.de.fieldStrength.txt")); + if (reactor.maxFieldCharge > 0) text.add(reactor.fieldCharge / reactor.maxFieldCharge * 100D + "%"); + drawHoveringText(text, mouseX, mouseY, fontRendererObj); + } + else if (GuiHelper.isInRect(197, 4, 18, 144, mouseX-guiLeft, mouseY-guiTop)){ + text.add(StatCollector.translateToLocal("gui.de.energySaturation.txt")); + if (reactor.maxEnergySaturation > 0) text.add((double)reactor.energySaturation / (double)reactor.maxEnergySaturation * 100D + "%"); + drawHoveringText(text, mouseX, mouseY, fontRendererObj); + } + else if (GuiHelper.isInRect(221, 4, 18, 144, mouseX-guiLeft, mouseY-guiTop)){ + text.add(StatCollector.translateToLocal("gui.de.fuelConversion.txt")); + if (reactor.reactorFuel + reactor.convertedFuel > 0) text.add((double)reactor.convertedFuel / ((double)reactor.convertedFuel + (double)reactor.reactorFuel) * 100D + "%"); + drawHoveringText(text, mouseX, mouseY, fontRendererObj); + } + } + + @Override + public void updateScreen() { + if (reactor.reactorState == TileReactorCore.STATE_OFFLINE || reactor.reactorState == TileReactorCore.STATE_STOP) collection.getComponent("DEACTIVATE").setEnabled(false); + else collection.getComponent("DEACTIVATE").setEnabled(true); + if ((reactor.reactorState == TileReactorCore.STATE_OFFLINE || reactor.reactorState == TileReactorCore.STATE_STOP) && reactor.reactorFuel > 0) collection.getComponent("ACTIVATE").setEnabled(true); + else collection.getComponent("ACTIVATE").setEnabled(false); + + super.updateScreen(); + } + + @Override + public void buttonClicked(int id, int button) { + container.sendObjectToServer(null, 20, id); + super.buttonClicked(id, button); + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java index cf1abddf..a9e29db8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java @@ -151,8 +151,8 @@ public class GUIToolConfig extends GUIBase { } @Override - public void buttonClicked(int id) { - super.buttonClicked(id); + public void buttonClicked(int id, int button) { + super.buttonClicked(id, button); if (id == 0 && screenLevel > 0){//button back setLevel(screenLevel - 1); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolInventory.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolInventory.java index 33dc45e1..b5326a13 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolInventory.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolInventory.java @@ -50,8 +50,8 @@ public class GUIToolInventory extends GUIBase { } @Override - public void buttonClicked(int id) { - super.buttonClicked(id); + public void buttonClicked(int id, int button) { + super.buttonClicked(id, button); if (guiToolConfig == null) guiToolConfig = new GUIToolConfig(player, container); guiToolConfig.updateItemButtons(); Minecraft.getMinecraft().displayGuiScreen(guiToolConfig); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentButton.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentButton.java index 1da8a445..8cd3fe6b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentButton.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentButton.java @@ -105,6 +105,6 @@ public class ComponentButton extends ComponentBase { @Override public void mouseClicked(int x, int y, int button) { Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); - gui.buttonClicked(buttonId); + gui.buttonClicked(buttonId, button); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentTextureButton.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentTextureButton.java new file mode 100644 index 00000000..9d7e6c92 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentTextureButton.java @@ -0,0 +1,54 @@ +package com.brandon3055.draconicevolution.client.gui.guicomponents; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + +/** + * Created by brandon3055 on 31/7/2015. + */ +public class ComponentTextureButton extends ComponentButton { + public int textureXPos; + public int textureYPos; + private ResourceLocation texture; + + //public ComponentTextureButton(int id, int xPos, int yPos, int textureXPos, int textureYPos, int xSise, int ySise, String text) { + public ComponentTextureButton(int x, int y, int textureXPos, int textureYPos, int xSize, int ySize, int id, GUIBase gui, String displayString, String hoverText, ResourceLocation texture) { + super(x, y, xSize, ySize, id, gui, displayString, hoverText); + this.textureXPos = textureXPos; + this.textureYPos = textureYPos; + this.texture = texture; + } + + @Override + public void renderForground(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { + + GL11.glPushMatrix(); + //GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); + minecraft.getTextureManager().bindTexture(texture); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int k = isMouseOver(mouseX, mouseY) ? 2 : 1; + GL11.glEnable(GL11.GL_BLEND); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + this.drawTexturedModalRect(this.x, this.y, textureXPos, textureYPos + k * ySize, this.xSize, this.ySize); + int l = 14737632; + + if (packedFGColour != 0) + { + l = packedFGColour; + } + else if (!this.enabled) + { + l = 10526880; + } + else if (isMouseOver(mouseX, mouseY)) + { + l = 16777120; + } + this.drawCenteredString(fontRendererObj, this.displayString, this.x + this.xSize / 2, this.y + (this.ySize - 8) / 2, l); + //GL11.glPopAttrib(); + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/GUIBase.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/GUIBase.java index 5a522ae2..19cd68fc 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/GUIBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/GUIBase.java @@ -122,7 +122,7 @@ public abstract class GUIBase extends GuiContainer { buttonPressed = false; } - public void buttonClicked(int id){buttonPressed = true;} + public void buttonClicked(int id, int button){buttonPressed = true;} public int getXSize() { return xSize; } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHandler.java index a6212fa3..4d3ee057 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHandler.java @@ -28,7 +28,7 @@ import java.util.*; * Created by Brandon on 8/02/2015. */ public class ResourceHandler { - private static ResourceHandler instance = new ResourceHandler(); + public static ResourceHandler instance = new ResourceHandler(); private static ResourceLocation defaultParticles; private static ResourceLocation particles = new ResourceLocation(References.RESOURCESPREFIX + "textures/particle/particles.png"); private static Map cachedResources = new HashMap(); @@ -49,10 +49,11 @@ public class ResourceHandler { { if (downloadThread != null && downloadThread.isFinished) { - LogHelper.info("Image Download Finished"); + if (downloadThread.isReloadRequired()) LogHelper.info("Image Download Finished"); downloadStatus = downloadThread.wasSuccessful ? 1 : 2; FMLCommonHandler.instance().bus().unregister(this); - addRSPack(); + addRSPack(event != null); + downloadThread = null; } } @@ -73,6 +74,7 @@ public class ResourceHandler { private List imageURLs; private boolean isFinished = false; private boolean wasSuccessful = true; + private boolean reloadRequired = false; public DownloadThread(List imageURLs) { @@ -85,8 +87,7 @@ public class ResourceHandler { for (String s : imageURLs) { LogHelper.info("Checking Image: " + s); - boolean success = true; - if (!checkExistence(s)) downloadImage(s); + if (!checkExistence(s)) if (downloadImage(s)) reloadRequired = true; if (checkExistence(s)) { try @@ -99,18 +100,15 @@ public class ResourceHandler { } catch (MalformedURLException e) { - success = false; LogHelper.error("Image Read Failed"); e.printStackTrace(); } catch (IOException e) { - success = false; LogHelper.error("Image Read Failed"); e.printStackTrace(); } } - else success = false; } isFinished = true; @@ -165,10 +163,14 @@ public class ResourceHandler { public boolean wasSuccessful() { return wasSuccessful; } + + public boolean isReloadRequired() { + return reloadRequired; + } } - private static void addRSPack() + private static void addRSPack(boolean refreash) { File rspack = new File(getConfigFolder(), "/resources"); if (!rspack.exists()) return; @@ -202,7 +204,7 @@ public class ResourceHandler { f.set(Minecraft.getMinecraft(), defaultResourcePacks); LogHelper.info("RS Added"); - Minecraft.getMinecraft().refreshResources(); + if (refreash) Minecraft.getMinecraft().refreshResources(); } catch (IllegalAccessException e) { e.printStackTrace(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/model/ModelReactorEnergyInjector.java b/src/main/java/com/brandon3055/draconicevolution/client/model/ModelReactorEnergyInjector.java new file mode 100644 index 00000000..d9992c5a --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/model/ModelReactorEnergyInjector.java @@ -0,0 +1,185 @@ +package com.brandon3055.draconicevolution.client.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.entity.Entity; +import org.lwjgl.opengl.GL11; + +/** + * ModelReactorPowerInjector - brandon3055 + * Created using Tabula 5.0.0 + */ +public class ModelReactorEnergyInjector extends ModelBase { + public ModelRenderer BasePlate; + public ModelRenderer shape14; + public ModelRenderer coreSupports; + public ModelRenderer element1; + public ModelRenderer support1; + public ModelRenderer element7; + public ModelRenderer element6; + public ModelRenderer element5; + public ModelRenderer element8; + public ModelRenderer element2; + public ModelRenderer element3; + public ModelRenderer element4; + public ModelRenderer support2; + public ModelRenderer support3; + public ModelRenderer support4; + public ModelRenderer connector1; + public ModelRenderer connector2; + public ModelRenderer connector3; + public ModelRenderer connector4; + public ModelRenderer connector5; + public ModelRenderer connector6; + public ModelRenderer connector7; + public ModelRenderer support8; + public ModelRenderer connector8; + public ModelRenderer support5; + public ModelRenderer support6; + public ModelRenderer support7; + + public ModelReactorEnergyInjector() { + this.textureWidth = 64; + this.textureHeight = 32; + this.connector5 = new ModelRenderer(this, 4, 19); + this.connector5.setRotationPoint(0.0F, 0.0F, 0.0F); + this.connector5.addBox(-3.5F, 3.5F, -0.5F, 1, 1, 1, 0.0F); + this.support4 = new ModelRenderer(this, 6, 21); + this.support4.setRotationPoint(0.0F, 0.0F, 0.0F); + this.support4.addBox(3.5F, 0.0F, -1.5F, 1, 7, 3, 0.0F); + this.support6 = new ModelRenderer(this, 2, 26); + this.support6.setRotationPoint(0.0F, 0.0F, 0.0F); + this.support6.addBox(4.5F, 3.0F, -0.5F, 1, 4, 1, 0.0F); + this.element2 = new ModelRenderer(this, 0, 12); + this.element2.setRotationPoint(0.0F, 0.0F, 0.0F); + this.element2.addBox(-1.0F, 2.5F, 2.0F, 2, 3, 1, 0.0F); + this.setRotateAngle(element2, 0.0F, 1.5707963267948966F, 0.0F); + this.element4 = new ModelRenderer(this, 0, 12); + this.element4.setRotationPoint(0.0F, 0.0F, 0.0F); + this.element4.addBox(-1.0F, 2.5F, 2.0F, 2, 3, 1, 0.0F); + this.setRotateAngle(element4, 0.0F, 3.141592653589793F, 0.0F); + this.element6 = new ModelRenderer(this, 0, 1); + this.element6.setRotationPoint(0.0F, 0.0F, 0.0F); + this.element6.addBox(-1.0F, -3.0F, 1.9F, 2, 5, 1, 0.0F); + this.setRotateAngle(element6, 0.0F, -1.5707963267948966F, 0.0F); + this.connector2 = new ModelRenderer(this, 8, 19); + this.connector2.setRotationPoint(0.0F, 0.0F, 0.0F); + this.connector2.addBox(-4.5F, -1.0F, -0.5F, 2, 1, 1, 0.0F); + this.element5 = new ModelRenderer(this, 0, 1); + this.element5.setRotationPoint(0.0F, 0.0F, 0.0F); + this.element5.addBox(-1.0F, -3.0F, 1.9F, 2, 5, 1, 0.0F); + this.setRotateAngle(element5, 0.0F, 1.5707963267948966F, 0.0F); + this.support7 = new ModelRenderer(this, 2, 26); + this.support7.setRotationPoint(0.0F, 0.0F, 0.0F); + this.support7.addBox(-0.5F, 3.0F, -5.5F, 1, 4, 1, 0.0F); + this.connector8 = new ModelRenderer(this, 4, 19); + this.connector8.setRotationPoint(0.0F, 0.0F, 0.0F); + this.connector8.addBox(-0.5F, 3.5F, 2.5F, 1, 1, 1, 0.0F); + this.element7 = new ModelRenderer(this, 0, 1); + this.element7.setRotationPoint(0.0F, 0.0F, 0.0F); + this.element7.addBox(-1.0F, -3.0F, 1.9F, 2, 5, 1, 0.0F); + this.support1 = new ModelRenderer(this, 42, 23); + this.support1.setRotationPoint(0.0F, -1.0F, 0.0F); + this.support1.addBox(-1.5F, 0.0F, 3.5F, 3, 7, 1, 0.0F); + this.connector7 = new ModelRenderer(this, 4, 19); + this.connector7.setRotationPoint(0.0F, 0.0F, 0.0F); + this.connector7.addBox(-0.5F, 3.5F, -3.5F, 1, 1, 1, 0.0F); + this.support5 = new ModelRenderer(this, 2, 26); + this.support5.setRotationPoint(0.0F, 0.0F, 0.0F); + this.support5.addBox(-5.5F, 3.0F, -0.5F, 1, 4, 1, 0.0F); + this.support8 = new ModelRenderer(this, 2, 26); + this.support8.setRotationPoint(0.0F, 0.0F, 0.0F); + this.support8.addBox(-0.5F, 3.0F, 4.5F, 1, 4, 1, 0.0F); + this.shape14 = new ModelRenderer(this, 0, 17); + this.shape14.setRotationPoint(0.0F, 0.0F, 0.0F); + this.shape14.addBox(-7.0F, 6.0F, -7.0F, 14, 1, 14, 0.0F); + this.BasePlate = new ModelRenderer(this, 0, 0); + this.BasePlate.setRotationPoint(0.0F, 0.0F, 0.0F); + this.BasePlate.addBox(-8.0F, 7.0F, -8.0F, 16, 1, 16, 0.0F); + this.element8 = new ModelRenderer(this, 0, 1); + this.element8.setRotationPoint(0.0F, 0.0F, 0.0F); + this.element8.addBox(-1.0F, -3.0F, 1.9F, 2, 5, 1, 0.0F); + this.setRotateAngle(element8, 0.0F, 3.141592653589793F, 0.0F); + this.element1 = new ModelRenderer(this, 0, 12); + this.element1.setRotationPoint(0.0F, -1.0F, 0.0F); + this.element1.addBox(-1.0F, 2.5F, 2.0F, 2, 3, 1, 0.0F); + this.connector4 = new ModelRenderer(this, 3, 21); + this.connector4.setRotationPoint(0.0F, 0.0F, 0.0F); + this.connector4.addBox(-0.5F, -1.0F, -4.5F, 1, 1, 2, 0.0F); + this.connector6 = new ModelRenderer(this, 4, 19); + this.connector6.setRotationPoint(0.0F, 0.0F, 0.0F); + this.connector6.addBox(2.5F, 3.5F, -0.5F, 1, 1, 1, 0.0F); + this.support2 = new ModelRenderer(this, 42, 23); + this.support2.setRotationPoint(0.0F, 0.0F, 0.0F); + this.support2.addBox(-1.5F, 0.0F, -4.5F, 3, 7, 1, 0.0F); + this.support3 = new ModelRenderer(this, 6, 21); + this.support3.setRotationPoint(0.0F, 0.0F, 0.0F); + this.support3.addBox(-4.5F, 0.0F, -1.5F, 1, 7, 3, 0.0F); + this.connector3 = new ModelRenderer(this, 3, 21); + this.connector3.setRotationPoint(0.0F, 0.0F, 0.0F); + this.connector3.addBox(-0.5F, -1.0F, 2.5F, 1, 1, 2, 0.0F); + this.element3 = new ModelRenderer(this, 0, 12); + this.element3.setRotationPoint(0.0F, 0.0F, 0.0F); + this.element3.addBox(-1.0F, 2.5F, 2.0F, 2, 3, 1, 0.0F); + this.setRotateAngle(element3, 0.0F, -1.5707963267948966F, 0.0F); + this.connector1 = new ModelRenderer(this, 8, 19); + this.connector1.setRotationPoint(0.0F, 0.0F, 0.0F); + this.connector1.addBox(2.5F, -1.0F, -0.5F, 2, 1, 1, 0.0F); + this.coreSupports = new ModelRenderer(this, 42, 17); + this.coreSupports.setRotationPoint(0.0F, -1.0F, 0.0F); + this.coreSupports.addBox(-2.5F, 6.0F, -2.5F, 5, 1, 5, 0.0F); + this.support1.addChild(this.connector5); + this.support1.addChild(this.support4); + this.support1.addChild(this.support6); + this.element1.addChild(this.element2); + this.element1.addChild(this.element4); + this.element1.addChild(this.element6); + this.support1.addChild(this.connector2); + this.element1.addChild(this.element5); + this.support1.addChild(this.support7); + this.support1.addChild(this.connector8); + this.element1.addChild(this.element7); + this.support1.addChild(this.connector7); + this.support1.addChild(this.support5); + this.support1.addChild(this.support8); + this.BasePlate.addChild(this.shape14); + this.element1.addChild(this.element8); + this.support1.addChild(this.connector4); + this.support1.addChild(this.connector6); + this.support1.addChild(this.support2); + this.support1.addChild(this.support3); + this.support1.addChild(this.connector3); + this.element1.addChild(this.element3); + this.support1.addChild(this.connector1); + } + + @Override + public void render(Entity entity, float brightness, float f1, float f2, float f3, float f4, float f5) { + this.support1.render(f5); + this.BasePlate.render(f5); + this.coreSupports.render(f5); + + float lastBrightnessX = OpenGlHelper.lastBrightnessX; + float lastBrightnessY = OpenGlHelper.lastBrightnessY; + + float b = brightness * 200F; + float colour = Math.min(2F, (brightness*2F) + 0.5F); + if (brightness > 0F) GL11.glDisable(GL11.GL_LIGHTING); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, Math.min(200F, lastBrightnessX + b), Math.min(200F, lastBrightnessY + b)); + GL11.glColor4f(colour, colour, colour, 1F); + this.element1.render(f5); + GL11.glColor4f(1F, 1F, 1F, 1F); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lastBrightnessX, lastBrightnessY); + if (brightness > 0F) GL11.glEnable(GL11.GL_LIGHTING); + } + + /** + * This is a helper function from Tabula to set the rotation of model parts + */ + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/model/ModelReactorStabilizerRing.java b/src/main/java/com/brandon3055/draconicevolution/client/model/ModelReactorStabilizerRing.java index 1617f12c..5d606bbb 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/model/ModelReactorStabilizerRing.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/model/ModelReactorStabilizerRing.java @@ -226,4 +226,6 @@ public class ModelReactorStabilizerRing extends ModelBase { modelRenderer.rotateAngleY = y; modelRenderer.rotateAngleZ = z; } + + } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderReactorCore.java b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderReactorCore.java new file mode 100644 index 00000000..7c3d679a --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderReactorCore.java @@ -0,0 +1,40 @@ +package com.brandon3055.draconicevolution.client.render.block; + +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; +import com.brandon3055.draconicevolution.client.render.tile.RenderTileReactorCore; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; + +/** + * Created by brandon3055 on 30/7/2015. + */ +public class RenderReactorCore implements IItemRenderer { + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + GL11.glPushMatrix(); + + if (type == ItemRenderType.INVENTORY) GL11.glRotated(180, 0, 1, 0); + else if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + GL11.glTranslated(0.5, 0.5, 0.5); + if (type == ItemRenderType.EQUIPPED)GL11.glRotated(90, 0, 1, 0); + } + + ResourceHandler.bindResource("textures/blocks/draconic_block_blank.png"); + GL11.glScaled(0.5, 0.5, 0.5); + RenderTileReactorCore.reactorModel.renderAll(); + + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderReactorEnergyInjector.java b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderReactorEnergyInjector.java new file mode 100644 index 00000000..efd728e5 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderReactorEnergyInjector.java @@ -0,0 +1,40 @@ +package com.brandon3055.draconicevolution.client.render.block; + +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; +import com.brandon3055.draconicevolution.client.render.tile.RenderTileReactorEnergyInjector; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; + +/** + * Created by brandon3055 on 30/7/2015. + */ +public class RenderReactorEnergyInjector implements IItemRenderer { + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + GL11.glPushMatrix(); + float scale = (1F / 16F); + + if (type == ItemRenderType.INVENTORY) GL11.glRotated(180, 0, 1, 0); + else if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + GL11.glTranslated(0.5, 0.5, 0.5); + GL11.glRotated(90, 0, 1, 0); + } + GL11.glRotated(180, 0, 0, 1); + + ResourceHandler.bindResource("textures/models/ModelReactorPowerInjector.png"); + RenderTileReactorEnergyInjector.modelReactorEnergyInjector.render(null, 1F, 0F, 0F, 0F, 0F, scale); + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderReactorStabilizer.java b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderReactorStabilizer.java new file mode 100644 index 00000000..328ac2ce --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderReactorStabilizer.java @@ -0,0 +1,45 @@ +package com.brandon3055.draconicevolution.client.render.block; + +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; +import com.brandon3055.draconicevolution.client.render.tile.RenderTileReactorStabilizer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; + +/** + * Created by brandon3055 on 30/7/2015. + */ +public class RenderReactorStabilizer implements IItemRenderer { + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + GL11.glPushMatrix(); + float scale = (1F / 16F); + + if (type == ItemRenderType.INVENTORY) GL11.glRotated(180, 0, 1, 0); + else if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + GL11.glTranslated(0.5, 0.5, 0.5); + if (type == ItemRenderType.EQUIPPED)GL11.glRotated(90, 0, 1, 0); + } + + ResourceHandler.bindResource("textures/models/reactorStabilizerCore.png"); + RenderTileReactorStabilizer.modelStabilizerCore.render(null, 0F, 1F, 0F, 0F, 0F, scale); + + ResourceHandler.bindResource("textures/models/reactorStabilizerRing.png"); + GL11.glRotated(90, 1, 0, 0); + GL11.glTranslated(0, -0.58, 0); + GL11.glScaled(0.95, 0.95, 0.95); + RenderTileReactorStabilizer.modelStabilizerRing.render(null, -70F, 1F, 0F, 0F, 0F, scale); + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleReactorBeam.java b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleReactorBeam.java new file mode 100644 index 00000000..1862e747 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleReactorBeam.java @@ -0,0 +1,224 @@ +package com.brandon3055.draconicevolution.client.render.particle; + +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; +import com.brandon3055.draconicevolution.common.blocks.multiblock.IIsSlave; +import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper; +import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorEnergyInjector; +import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorStabilizer; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MathHelper; +import org.lwjgl.opengl.GL11; + +/** + * Created by Brandon on 17/7/2015. + */ +public class ParticleReactorBeam extends EntityFX { + /** + * Particle Type 0 = Energy Ring, 1 = single particle + */ + private boolean renderParticle = true; + private TileEntity tile; + private boolean isInjectorBeam = false; + + public ParticleReactorBeam(TileEntity tile) { + super(tile.getWorldObj(), tile.xCoord + 0.5, tile.yCoord + 0.5, tile.zCoord + 0.5, 0.0D, 0.0D, 0.0D); + this.tile = tile; + this.particleRed = 1F; + this.particleGreen = 1F; + this.particleBlue = 1F; + this.noClip = true; + this.motionX = 0.0D; + this.motionY = 0.0D; + this.motionZ = 0.0D; + this.particleMaxAge = 4; + this.setSize(1F, 1F); + isInjectorBeam = tile instanceof TileReactorEnergyInjector; + } + + public void update(boolean render) + { + for (this.renderParticle = render; this.particleMaxAge - this.particleAge < 4; ++this.particleMaxAge) {} + } + + @Override + public void onUpdate() { + + this.prevPosX = this.posX; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; + + + if (this.particleAge++ >= this.particleMaxAge) + { + this.setDead(); + } + } + + + @Override + public void renderParticle(Tessellator tessellator, float partialTick, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) { + if (!((IIsSlave)tile).isActive()) return; + tessellator.draw(); + GL11.glPushMatrix(); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glAlphaFunc(GL11.GL_GREATER, 0.0F); + + float xx = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)partialTick - interpPosX); + float yy = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)partialTick - interpPosY); + float zz = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)partialTick - interpPosZ); + GL11.glTranslated((double)xx, (double)yy, (double)zz); + + //Common Fields + MultiblockHelper.TileLocation master = ((IIsSlave)tile).getMaster(); + float offsetX = (float)(master.posX - tile.xCoord); + float offsetY = (float)((double)master.posY - tile.yCoord); + float offsetZ = (float)(master.posZ - tile.zCoord); + float length = MathHelper.sqrt_float(offsetX * offsetX + offsetY * offsetY + offsetZ * offsetZ); + + + //Rotate beam to face target + float f7 = MathHelper.sqrt_float(offsetX * offsetX + offsetZ * offsetZ); + GL11.glRotatef((float) (-Math.atan2((double) offsetZ, (double) offsetX)) * 180.0F / (float) Math.PI - 90.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef((float)(-Math.atan2((double)f7, (double)offsetY)) * 180.0F / (float)Math.PI - 90.0F, 1.0F, 0.0F, 0.0F); + + if (tile instanceof TileReactorStabilizer) renderStabilizerEffect(tessellator, offsetX, offsetY, offsetZ, length, partialTick); + else { + GL11.glShadeModel(GL11.GL_SMOOTH); + GL11.glTranslated(0, 0, 0.3); + //GL11.glPushMatrix(); + GL11.glRotatef(((float)particleAge + partialTick)*20F, 0, 0, 1); + ResourceHandler.bindResource("textures/particle/reactorEnergyBeam.png"); + float sizeOrigin = 0.5F; + float sizeTarget = 0.2F; + int color = 0xFF2200; + int alpha = 200; + length -= 1; + + float speed = 20F; + float texV2 = 0.0F + ((float)particleAge + partialTick) * 0.01F * speed; + float texV1 = MathHelper.sqrt_float(offsetX * offsetX + offsetY * offsetY + offsetZ * offsetZ) + ((float)particleAge + partialTick) * 0.01F * speed; + + tessellator.startDrawing(5); + tessellator.setBrightness(200); + + byte b0 = 16; + for (int i = 0; i <= b0; ++i) + { + float verX = MathHelper.sin((float)(i % b0) * (float)Math.PI * 2.13F / (float)b0) * sizeTarget; + float verY = MathHelper.cos((float)(i % b0) * (float)Math.PI * 2.13F / (float)b0) * sizeTarget; + float texU = (float)(i % b0) * 1.0F / (float)b0; + tessellator.setColorRGBA((color & 0xFF0000) >> 16, (color & 0xFF00) >> 8, (color & 0xFF), alpha); + + tessellator.addVertexWithUV((double)(verX * sizeOrigin), (double)(verY * sizeOrigin), 0.0D, (double)texU, (double)texV1); + tessellator.setColorRGBA((color & 0xFF0000) >> 16, (color & 0xFF00) >> 8, (color & 0xFF), 0); + tessellator.addVertexWithUV((double)verX, (double)verY, (double)length, (double)texU, (double)texV2); + } + + sizeTarget = 0.1F; + + length = 0F; + for (int i = 0; i <= b0; ++i) + { + float verX = MathHelper.sin((float)(i % b0) * (float)Math.PI * 2.3F / (float)b0) * sizeTarget; + float verY = MathHelper.cos((float)(i % b0) * (float)Math.PI * 2.3F / (float)b0) * sizeTarget; + float texU = (float)(i % b0) * 1.0F / (float)b0; + tessellator.setColorRGBA((color & 0xFF0000) >> 16, (color & 0xFF00) >> 8, (color & 0xFF), 0); + + tessellator.addVertexWithUV((double)(verX * sizeOrigin), (double)(verY * sizeOrigin), -0.55D, (double)texU, (double)texV1); + tessellator.setColorRGBA((color & 0xFF0000) >> 16, (color & 0xFF00) >> 8, (color & 0xFF), alpha); + tessellator.addVertexWithUV((double)verX, (double)verY, (double)length, (double)texU, (double)texV2); + } + + tessellator.draw(); + //GL11.glPopMatrix(); + GL11.glRotatef(((float)particleAge + partialTick)*-30F, 0, 0, 1); + + tessellator.startDrawing(5); + tessellator.setBrightness(200); + color = 0xFF4400; + sizeOrigin = 0.15F; + sizeTarget = 0.6F; + length = MathHelper.sqrt_float(offsetX * offsetX + offsetY * offsetY + offsetZ * offsetZ) - 1; + GL11.glTranslated(0, 0, -0.1); + + for (int i = 0; i <= b0; ++i) + { + float verX = MathHelper.sin((float)(i % b0) * (float)Math.PI * 2.13F / (float)b0) * sizeTarget; + float verY = MathHelper.cos((float)(i % b0) * (float)Math.PI * 2.13F / (float)b0) * sizeTarget; + float texU = (float)(i % b0) * 1.0F / (float)b0; + tessellator.setColorRGBA((color & 0xFF0000) >> 16, (color & 0xFF00) >> 8, (color & 0xFF), alpha/2); + + tessellator.addVertexWithUV((double)(verX * sizeOrigin), (double)(verY * sizeOrigin), 0.0D, (double)texU, (double)texV1); + tessellator.setColorRGBA((color & 0xFF0000) >> 16, (color & 0xFF00) >> 8, (color & 0xFF), 0); + tessellator.addVertexWithUV((double)verX, (double)verY, (double)length, (double)texU, (double)texV2); + } + + tessellator.draw(); + GL11.glShadeModel(GL11.GL_FLAT); + } + + GL11.glPopMatrix(); + GL11.glEnable(GL11.GL_CULL_FACE); + ResourceHandler.bindDefaultParticles(); + tessellator.startDrawingQuads(); + } + + private void renderStabilizerEffect(Tessellator tessellator, float offsetX, float offsetY, float offsetZ, float length, float partialTick){ + GL11.glShadeModel(GL11.GL_SMOOTH); + + //Draw Beams + GL11.glPushMatrix(); + GL11.glTranslated(0, 0, -0.35); + ResourceHandler.bindResource("textures/particle/reactorBeam.png"); + drawBeam(tessellator, 1F, 0.355F, 0.8F, offsetX, offsetY, offsetZ, particleAge, partialTick, true, false, 0x00ffff); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glTranslated(0, 0, 0.45); + float coreSize = 0.9F; + float s = 0.355F; + drawBeam(tessellator, s / coreSize, coreSize, length - 1F, offsetX, offsetY, offsetZ, particleAge, partialTick, false, false, 0x00ffff); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glTranslated(0, 0, -0.35); + drawBeam(tessellator, 1F, 0.263F, 0.8F, offsetX, offsetY, offsetZ, particleAge, partialTick, true, true, 0xff6600); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glTranslated(0, 0, 0.45); + coreSize = 0.5F; + s = 0.263F; + drawBeam(tessellator, s / coreSize, coreSize, length - 0.5F, offsetX, offsetY, offsetZ, particleAge, partialTick, false, true, 0xff6600); + GL11.glPopMatrix(); + + GL11.glShadeModel(GL11.GL_FLAT); + } + + /**Size Origin is the fraction of size start Target + * So if size target is 10 and size origin is 0.5 origin will actually be 5*/ + private void drawBeam(Tessellator tessellator, float sizeOrigin, float sizeTarget, float length, float offsetX, float offsetY, float offsetZ, int tick, float partialTick, boolean reverseTransparency, boolean reverseDirection, int color) { + float speed = 3F; + float texV2 = -0.1F + ((float)tick + partialTick) * (reverseDirection ? -0.01F : 0.01F) * speed; + float texV1 = MathHelper.sqrt_float(offsetX * offsetX + offsetY * offsetY + offsetZ * offsetZ) / 32.0F + ((float)tick + partialTick) * (reverseDirection ? -0.01F : 0.01F) * speed; + + tessellator.startDrawing(5); + tessellator.setBrightness(200); + + byte b0 = 16; + for (int i = 0; i <= b0; ++i) + { + float verX = MathHelper.sin((float)(i % b0) * (float)Math.PI * 2.13325F / (float)b0) * sizeTarget; + float verY = MathHelper.cos((float)(i % b0) * (float)Math.PI * 2.13325F / (float)b0) * sizeTarget; + float texU = (float)(i % b0) * 1.0F / (float)b0; + tessellator.setColorRGBA((color & 0xFF0000) >> 16, (color & 0xFF00) >> 8, (color & 0xFF), reverseTransparency ? 0 : 255); + tessellator.addVertexWithUV((double)(verX * sizeOrigin), (double)(verY * sizeOrigin), 0.0D, (double)texU, (double)texV1); + tessellator.setColorRGBA((color & 0xFF0000) >> 16, (color & 0xFF00) >> 8, (color & 0xFF), reverseTransparency ? 255 : 0); + tessellator.addVertexWithUV((double)verX, (double)verY, (double)length, (double)texU, (double)texV2); + } + + tessellator.draw(); + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyInfiser.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyInfiser.java index abc63aa1..49de53de 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyInfiser.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyInfiser.java @@ -38,21 +38,12 @@ public class RenderTileEnergyInfiser extends TileEntitySpecialRenderer bindTexture(texture); tessellator.setColorRGBA(255, 255, 255, 255); - //tessellator.setBrightness(200); - //tessellator.setColorOpaque_F(1f, 1f, 1f); - //OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)l1, (float)l2); -// GL11.glEnable(GL11.GL_CULL_FACE); -// GL11.glDisable(GL11.GL_ALPHA_TEST); -// GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); -// GL11.glDepthMask(true); drawBase(tessellator); drawWings(tessellator, tile); renderChargingItem(tile); - GL11.glDisable(GL11.GL_ALPHA_TEST); -// GL11.glDepthMask(false); } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyPylon.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyPylon.java index ae52b3d8..c75cecde 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyPylon.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyPylon.java @@ -88,7 +88,7 @@ public class RenderTileEnergyPylon extends TileEntitySpecialRenderer { GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_TEXTURE_2D); - + GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); GL11.glDisable(GL11.GL_BLEND); GL11.glDepthMask(true); GL11.glPopAttrib(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileReactorCore.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileReactorCore.java index c03e1c60..f6243c18 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileReactorCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileReactorCore.java @@ -15,7 +15,7 @@ import org.lwjgl.opengl.GL11; * Created by Brandon on 16/6/2015. */ public class RenderTileReactorCore extends TileEntitySpecialRenderer { - private IModelCustom reactorModel; + public static IModelCustom reactorModel; public RenderTileReactorCore(){ reactorModel = AdvancedModelLoader.loadModel(new ResourceLocation(References.MODID.toLowerCase(), "models/reactorCoreModel.obj")); @@ -24,16 +24,24 @@ public class RenderTileReactorCore extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { TileReactorCore tile = (TileReactorCore) tileEntity; +// tile.renderList.clear(); GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); - GL11.glDisable(GL11.GL_LIGHTING); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 200F, 200F); renderReactorCore(tile, partialTick); +// for (MultiblockHelper.TileOffset offset : tile.stabilizerLocations){ +// if (!(offset.getTileEntity(tileEntity) instanceof TileReactorStabilizer)) continue; +// GL11.glPushMatrix(); +// +// TileReactorStabilizer stabilizer = (TileReactorStabilizer)offset.getTileEntity(tileEntity); +// GL11.glTranslated(-offset.offsetX, -offset.offsetY, -offset.offsetZ); +// //RenderTileReactorStabilizer.renderCore(stabilizer, partialTick); +// //RenderTileReactorStabilizer.renderEffects(stabilizer, partialTick); +// +// GL11.glPopMatrix(); +// } - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); } @@ -46,25 +54,49 @@ public class RenderTileReactorCore extends TileEntitySpecialRenderer { double b = ff * 2; double a = ff < 0.1 ? (ff * 10) + 0.5 : 1; + //Pre Render + GL11.glPushMatrix(); + GL11.glDisable(GL11.GL_LIGHTING); + float lastBrightnessX = OpenGlHelper.lastBrightnessX; + float lastBrightnessY = OpenGlHelper.lastBrightnessY; + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 200F, 200F); + + //Render inner ResourceHandler.bindResource("textures/models/reactorCore.png"); - //GL11.glScaled(2F, 2F, 2F); + ResourceHandler.bindResource("textures/blocks/draconic_block_blank.png"); + if (tile.reactorFuel + tile.convertedFuel < 144){ + GL11.glPushMatrix(); + GL11.glScaled(0.1, 0.1, 0.1); + reactorModel.renderAll(); + GL11.glPopMatrix(); + } + GL11.glRotatef(rotation, 0.5F, 1F, 0.5F); + GL11.glScaled(0.5, 0.5, 0.5); + double r3 = tile.getCoreDiameter(); + GL11.glScaled(r3, r3, r3); reactorModel.renderAll(); - + //Mid Render GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glAlphaFunc(GL11.GL_GREATER, 0F); + //Render Outer ResourceHandler.bindResource("textures/models/reactorShieldPlate.png"); - - GL11.glColor4d(r, g, b, a); GL11.glScaled(1.03F, 1.03F, 1.03F); GL11.glRotatef(2343, 0.5F, 1F, 0.5F); GL11.glRotatef(-rotation*2, 0.5F, 1F, 0.5F); reactorModel.renderAll(); + + //Post Render + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_BLEND); + GL11.glColor4f(1f, 1f, 1f, 1f); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lastBrightnessX, lastBrightnessY); + GL11.glPopMatrix(); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileReactorEnergyInjector.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileReactorEnergyInjector.java new file mode 100644 index 00000000..ef19c050 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileReactorEnergyInjector.java @@ -0,0 +1,45 @@ +package com.brandon3055.draconicevolution.client.render.tile; + +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; +import com.brandon3055.draconicevolution.client.model.ModelReactorEnergyInjector; +import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorEnergyInjector; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import org.lwjgl.opengl.GL11; + +/** + * Created by Brandon on 6/7/2015. + */ +public class RenderTileReactorEnergyInjector extends TileEntitySpecialRenderer { + + public static ModelReactorEnergyInjector modelReactorEnergyInjector = new ModelReactorEnergyInjector(); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); + + renderCore((TileReactorEnergyInjector) tileEntity, partialTick); + + GL11.glPopMatrix(); + } + + public static void renderCore(TileReactorEnergyInjector tile, float partialTick) { + GL11.glPushMatrix(); + float scale = (1F / 16F); + + switch (tile.facingDirection){ + case 1: GL11.glRotated(180, -1, 0, 0); break; + case 2: GL11.glRotated(90, 1, 0, 0); break; + case 3: GL11.glRotated(90, -1, 0, 0); break; + case 4: GL11.glRotated(90, 0, 0, -1); break; + case 5: GL11.glRotated(90, 0, 0, 1); + } + + ResourceHandler.bindResource("textures/models/ModelReactorPowerInjector.png"); + modelReactorEnergyInjector.render(null, tile.modelIllumination, 0F, 0F, 0F, 0F, scale); + + GL11.glPopMatrix(); + } + +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileReactorStabilizer.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileReactorStabilizer.java index 31960693..b79d12b3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileReactorStabilizer.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileReactorStabilizer.java @@ -3,14 +3,9 @@ package com.brandon3055.draconicevolution.client.render.tile; import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import com.brandon3055.draconicevolution.client.model.ModelReactorStabilizerCore; import com.brandon3055.draconicevolution.client.model.ModelReactorStabilizerRing; -import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorStabilizer; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; /** @@ -27,12 +22,13 @@ public class RenderTileReactorStabilizer extends TileEntitySpecialRenderer { GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); renderCore((TileReactorStabilizer) tileEntity, partialTick); - renderEffects((TileReactorStabilizer) tileEntity, partialTick); + //renderEffects((TileReactorStabilizer) tileEntity, partialTick); GL11.glPopMatrix(); } - private void renderCore(TileReactorStabilizer tile, float partialTick) { + public static void renderCore(TileReactorStabilizer tile, float partialTick) { + GL11.glPushMatrix(); float scale = (1F / 16F); float coreRotation = tile.coreRotation + (partialTick * tile.coreSpeed); float ringRotation = tile.ringRotation + (partialTick * tile.ringSpeed); @@ -48,61 +44,80 @@ public class RenderTileReactorStabilizer extends TileEntitySpecialRenderer { ResourceHandler.bindResource("textures/models/reactorStabilizerCore.png"); modelStabilizerCore.render(null, coreRotation, tile.modelIllumination, 0F, 0F, 0F, scale); - GL11.glPushMatrix(); ResourceHandler.bindResource("textures/models/reactorStabilizerRing.png"); GL11.glRotated(90, 1, 0, 0); GL11.glTranslated(0, -0.58, 0); GL11.glScaled(0.95, 0.95, 0.95); GL11.glRotatef(ringRotation, 0, 1, 0); - modelStabilizerRing.render(null, 0F, tile.modelIllumination, 0F, 0F, 0F, scale); + modelStabilizerRing.render(null, -70F, tile.modelIllumination, 0F, 0F, 0F, scale); GL11.glPopMatrix(); } - private void renderEffects(TileReactorStabilizer tile, float partialTick) { - if (tile.isValid) - { - float someRotation = tile.tick; - MultiblockHelper.TileLocation master = tile.masterLocation; - - float f2 = someRotation + partialTick; - float f3 = MathHelper.sin(f2 * 0.2F) / 2.0F + 0.5F; - f3 = (f3 * f3 + f3) * 0.2F; - float f4 = (float)(master.posX - tile.xCoord - (0 - 0) * (double)(1.0F - partialTick)); - float f5 = (float)((double)f3 + master.posY - 1.0D - tile.yCoord - (0 - 0) * (double)(1.0F - partialTick)); - float f6 = (float)(master.posZ - tile.zCoord - (0 - 0) * (double)(1.0F - partialTick)); - float f7 = MathHelper.sqrt_float(f4 * f4 + f6 * f6); - float f8 = MathHelper.sqrt_float(f4 * f4 + f5 * f5 + f6 * f6); - GL11.glPushMatrix(); - // GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_ + 2.0F, (float)p_76986_6_); - GL11.glRotatef((float)(-Math.atan2((double)f6, (double)f4)) * 180.0F / (float)Math.PI - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef((float)(-Math.atan2((double)f7, (double)f5)) * 180.0F / (float)Math.PI - 90.0F, 1.0F, 0.0F, 0.0F); - Tessellator tessellator = Tessellator.instance; - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL11.GL_CULL_FACE); - ResourceHandler.bindTexture(new ResourceLocation("textures/entity/endercrystal/endercrystal_beam.png")); - - GL11.glShadeModel(GL11.GL_SMOOTH); - float f9 = 0.0F - ((float)tile.tick + partialTick) * 0.01F; - float f10 = MathHelper.sqrt_float(f4 * f4 + f5 * f5 + f6 * f6) / 32.0F - ((float)tile.tick + partialTick) * 0.01F; - tessellator.startDrawing(5); - byte b0 = 8; - - for (int i = 0; i <= b0; ++i) - { - float f11 = MathHelper.sin((float)(i % b0) * (float)Math.PI * 2.0F / (float)b0) * 0.75F; - float f12 = MathHelper.cos((float)(i % b0) * (float)Math.PI * 2.0F / (float)b0) * 0.75F; - float f13 = (float)(i % b0) * 1.0F / (float)b0; - tessellator.setColorOpaque_I(0); - tessellator.addVertexWithUV((double)(f11 * 0.2F), (double)(f12 * 0.2F), 0.0D, (double)f13, (double)f10); - tessellator.setColorOpaque_I(16777215); - tessellator.addVertexWithUV((double)f11, (double)f12, (double)f8, (double)f13, (double)f9); - } - - tessellator.draw(); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glShadeModel(GL11.GL_FLAT); - RenderHelper.enableStandardItemLighting(); - GL11.glPopMatrix(); - } - } +// public static void renderEffects(TileReactorStabilizer tile, float partialTick) { +// if (tile.isValid) +// { +// //Common Fields +// MultiblockHelper.TileLocation master = tile.masterLocation; +// float offsetX = (float)(master.posX - tile.xCoord); +// float offsetY = (float)((double)master.posY - tile.yCoord); +// float offsetZ = (float)(master.posZ - tile.zCoord); +// float length = MathHelper.sqrt_float(offsetX * offsetX + offsetY * offsetY + offsetZ * offsetZ); +// +// Tessellator tessellator = Tessellator.instance; +// +// //Pre Render +// GL11.glPushMatrix(); +//// RenderHelper.disableStandardItemLighting(); +// GL11.glDisable(GL11.GL_CULL_FACE); +// GL11.glShadeModel(GL11.GL_SMOOTH); +// GL11.glEnable(GL11.GL_BLEND); +// OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); +// GL11.glAlphaFunc(GL11.GL_GREATER, 0.0F); +// GL11.glDisable(GL11.GL_LIGHTING); +// GL11.glDepthMask(false); +// +// //Rotate beam to face target +// float f7 = MathHelper.sqrt_float(offsetX * offsetX + offsetZ * offsetZ); +// GL11.glRotatef((float) (-Math.atan2((double) offsetZ, (double) offsetX)) * 180.0F / (float) Math.PI - 90.0F, 0.0F, 1.0F, 0.0F); +// GL11.glRotatef((float)(-Math.atan2((double)f7, (double)offsetY)) * 180.0F / (float)Math.PI - 90.0F, 1.0F, 0.0F, 0.0F); +// +// +// //Draw Beams +// GL11.glPushMatrix(); +// GL11.glTranslated(0, 0, -0.35); +// ResourceHandler.bindTexture(new ResourceLocation("textures/entity/endercrystal/endercrystal_beam.png")); +//// drawBeam(tessellator, 1F, 0.355F, 0.8F, offsetX, offsetY, offsetZ, tile.tick, partialTick, true, false); +// GL11.glPopMatrix(); +// +// GL11.glPushMatrix(); +// GL11.glTranslated(0, 0, 0.4526); +// float coreSize = 1.1F; +// float s = 0.355F; +//// drawBeam(tessellator, s/coreSize, coreSize, length - 0.5F, offsetX, offsetY, offsetZ, tile.tick, partialTick, false, false); +// GL11.glPopMatrix(); +// +//// GL11.glPushMatrix(); +//// GL11.glTranslated(0, 0, -0.35); +//// ResourceHandler.bindTexture(new ResourceLocation("textures/entity/endercrystal/endercrystal_beam.png")); +//// drawBeam(tessellator, 1F, 0.26F, 0.8F, offsetX, offsetY, offsetZ, tile.tick, partialTick, true, true); +//// GL11.glPopMatrix(); +//// +//// GL11.glPushMatrix(); +//// GL11.glTranslated(0, 0, 0.4526); +//// coreSize = 1.1F; +//// s = 0.263F; +//// drawBeam(tessellator, s/coreSize, coreSize, length - 0.5F, offsetX, offsetY, offsetZ, tile.tick, partialTick, false, true); +//// GL11.glPopMatrix(); +// +// //Post Render +// GL11.glDepthMask(true); +// GL11.glEnable(GL11.GL_LIGHTING); +// GL11.glEnable(GL11.GL_CULL_FACE); +// GL11.glShadeModel(GL11.GL_FLAT); +//// RenderHelper.enableStandardItemLighting(); +// GL11.glDisable(GL11.GL_BLEND); +// GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); +// GL11.glPopMatrix(); +// } +// } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java index 101886df..e0de11e3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java @@ -5,6 +5,7 @@ import com.brandon3055.draconicevolution.client.creativetab.DETab; import com.brandon3055.draconicevolution.client.gui.GuiHandler; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyBeam; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; +import com.brandon3055.draconicevolution.client.render.particle.ParticleReactorBeam; import com.brandon3055.draconicevolution.common.achievements.Achievements; import com.brandon3055.draconicevolution.common.entity.*; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; @@ -24,6 +25,7 @@ import com.brandon3055.draconicevolution.common.tileentities.gates.TileFluidGate import com.brandon3055.draconicevolution.common.tileentities.gates.TileFluxGate; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.*; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorCore; +import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorEnergyInjector; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorStabilizer; import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.world.DraconicWorldGenerator; @@ -35,6 +37,8 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.OreDictionary; @@ -52,6 +56,9 @@ public class CommonProxy { initializeNetwork(); if (ModBlocks.isEnabled(ModBlocks.draconiumOre)) OreDictionary.registerOre("oreDraconium", ModBlocks.draconiumOre); + if (ModBlocks.isEnabled(ModBlocks.draconiumBlock)) OreDictionary.registerOre("blockDraconium", new ItemStack(ModBlocks.draconiumBlock)); + if (ModBlocks.isEnabled(ModBlocks.draconicBlock)) OreDictionary.registerOre("blockDraconiumAwakened", new ItemStack(ModBlocks.draconicBlock)); + if (ModItems.isEnabled(ModItems.draconiumIngot)) OreDictionary.registerOre("ingotDraconium", ModItems.draconiumIngot); if (ModItems.isEnabled(ModItems.draconiumDust)) OreDictionary.registerOre("dustDraconium", ModItems.draconiumDust); if (ModItems.isEnabled(ModItems.draconicIngot)) OreDictionary.registerOre("ingotDraconiumAwakened", ModItems.draconicIngot); @@ -150,6 +157,7 @@ public class CommonProxy { GameRegistry.registerTileEntity(TileFluxGate.class, References.RESOURCESPREFIX + "TileFluxGate"); GameRegistry.registerTileEntity(TileFluidGate.class, References.RESOURCESPREFIX + "TileFluidGate"); GameRegistry.registerTileEntity(TileReactorStabilizer.class, References.RESOURCESPREFIX + "TileReactorStabilizer"); + GameRegistry.registerTileEntity(TileReactorEnergyInjector.class, References.RESOURCESPREFIX + "TileReactorEnergyInjector"); if (DraconicEvolution.debug) { GameRegistry.registerTileEntity(TileTestBlock.class, References.RESOURCESPREFIX + "TileTestBlock"); GameRegistry.registerTileEntity(TileContainerTemplate.class, References.RESOURCESPREFIX + "TileContainerTemplate"); @@ -189,7 +197,9 @@ public class CommonProxy { return null; } - + public ParticleReactorBeam reactorBeam(TileEntity tile, ParticleReactorBeam oldBeam, boolean render) { + return null; + } public void spawnParticle(Object particle, int range) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/ModBlocks.java b/src/main/java/com/brandon3055/draconicevolution/common/ModBlocks.java index aa36934e..a0bb70b6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/ModBlocks.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/ModBlocks.java @@ -46,6 +46,7 @@ public class ModBlocks { public static BlockDE reactorCore; public static BlockDE flowGate; public static BlockDE reactorStabilizer; + public static BlockDE reactorEnergyInjector; public static Block safetyFlame; public static ItemStack resurrectionStone; @@ -83,6 +84,7 @@ public class ModBlocks { reactorCore = new ReactorCore(); flowGate = new FlowGate(); reactorStabilizer = new ReactorStabilizer(); + reactorEnergyInjector = new ReactorEnergyInjector(); longRangeDislocator = new LongRangeDislocator(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/CustomSpawner.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/CustomSpawner.java index b4dce7ce..0ec84010 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/CustomSpawner.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/CustomSpawner.java @@ -3,6 +3,7 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileCustomSpawner; import com.brandon3055.draconicevolution.common.utills.IHudDisplayBlock; @@ -26,6 +27,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Random; @@ -52,6 +54,11 @@ public class CustomSpawner extends BlockDE implements IHudDisplayBlock { if (item != null && item.getItem().equals(ModItems.mobSoul)) { String name = ItemNBTHelper.getString(item, "Name", "Pig"); + if ((!ConfigHandler.spawnerListType && Arrays.asList(ConfigHandler.spawnerList).contains(name)) || (ConfigHandler.spawnerListType && !Arrays.asList(ConfigHandler.spawnerList).contains(name))) { + if (!world.isRemote)player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.RED + "[Error] soul disabled in config!")); + return false; + } + if (name.equals(spawner.getBaseLogic().entityName)){return false;} spawner.getBaseLogic().entityName = name; spawner.isSetToSpawn = true; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/IIsSlave.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/IIsSlave.java new file mode 100644 index 00000000..c3b9f38b --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/IIsSlave.java @@ -0,0 +1,14 @@ +package com.brandon3055.draconicevolution.common.blocks.multiblock; + +/** + * Created by Brandon on 23/7/2015. + */ +public interface IIsSlave { + public MultiblockHelper.TileLocation getMaster(); + + public void shutDown(); + + public boolean checkForMaster(); + + public boolean isActive(); +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java index a1b9b254..47342b41 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java @@ -221,7 +221,7 @@ public class InvisibleMultiblock extends BlockDE implements IHudDisplayBlock { list.add(InfoHelper.HITC() + ModBlocks.energyStorageCore.getLocalizedName()); list.add("Tier: " + InfoHelper.ITC() + (master.getTier() + 1)); String BN = String.valueOf(master.getEnergyStored()); - if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2); + if (BN.substring(Math.max(BN.length() - 2, 0)).contentEquals(".0")) BN = BN.substring(0, Math.max(BN.length() - 2, 0)); list.add(StatCollector.translateToLocal("info.de.charge.txt") + ": " + InfoHelper.ITC() + Utills.formatNumber(master.getEnergyStored()) + " / " + Utills.formatNumber(master.getMaxEnergyStored()) + " [" + BN + " RF]"); return list; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/MultiblockHelper.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/MultiblockHelper.java index 9eb6571a..02481f35 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/MultiblockHelper.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/MultiblockHelper.java @@ -13,6 +13,8 @@ public class MultiblockHelper { public static class TileLocation extends ChunkCoordinates { + public boolean initialized = false; + public TileLocation(){ } @@ -21,6 +23,7 @@ public class MultiblockHelper { this.posX = x; this.posY = y; this.posZ = z; + initialized = true; } public int getXCoord(){ @@ -32,19 +35,32 @@ public class MultiblockHelper { } public int getZCoord(){ - return posY; + return posZ; + } + + public boolean isThisLocation(int x, int y, int z){ + return x == posX && y == posY && z == posZ; + } + + @Override + public void set(int x, int y, int z) { + initialized = true; + super.set(x, y, z); } public void setXCoord(int x){ posX = x; + initialized = true; } public void setYCoord(int y){ posY = y; + initialized = true; } public void setZCoord(int z){ posZ = z; + initialized = true; } public TileEntity getTileEntity(World world) { return world.getTileEntity(posX, posY, posZ); } @@ -53,12 +69,72 @@ public class MultiblockHelper { compound.setInteger("X_"+key, posX); compound.setInteger("Y_"+key, posY); compound.setInteger("Z_"+key, posZ); + compound.setBoolean("Init_"+key, initialized); } public void readFromNBT(NBTTagCompound compound, String key) { posX = compound.getInteger("X_"+key); posY = compound.getInteger("Y_"+key); posZ = compound.getInteger("Z_"+key); + initialized = compound.getBoolean("Z_"+key); + } + } + + public static class TileOffset { + public int offsetX; + public int offsetY; + public int offsetZ; + + public TileOffset(){} + + public TileOffset(int x, int y, int z, int offsetX, int offsetY, int offsetZ){ + this.offsetX = x - offsetX; + this.offsetY = y - offsetY; + this.offsetZ = z - offsetZ; + } + + public TileOffset(TileEntity tile1, TileEntity offsetTile){ + this.offsetX = tile1.xCoord - offsetTile.xCoord; + this.offsetY = tile1.yCoord - offsetTile.yCoord; + this.offsetZ = tile1.zCoord - offsetTile.zCoord; + } + + public int getXCoord(TileEntity tileEntity){ + return tileEntity.xCoord - offsetX; + } + + public int getYCoord(TileEntity tileEntity){ + return tileEntity.yCoord - offsetY; + } + + public int getZCoord(TileEntity tileEntity){ + return tileEntity.zCoord - offsetZ; + } + + public int getXCoord(int xCoord){ + return xCoord - offsetX; + } + + public int getYCoord(int yCoord){ + return yCoord - offsetY; + } + + public int getZCoord(int zCoord){ + return zCoord - offsetZ; + } + + public TileEntity getTileEntity(TileEntity tileEntity) { return tileEntity.getWorldObj().getTileEntity(getXCoord(tileEntity), getYCoord(tileEntity), getZCoord(tileEntity)); } + + public void writeToNBT(NBTTagCompound compound, String key) { + compound.setInteger("X_"+key, offsetX); + compound.setInteger("Y_"+key, offsetY); + compound.setInteger("Z_"+key, offsetZ); + } + + public void readFromNBT(NBTTagCompound compound, String key) { + offsetX = compound.getInteger("X_"+key); + offsetY = compound.getInteger("Y_"+key); + offsetZ = compound.getInteger("Z_"+key); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorCore.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorCore.java index c609d356..26b492c5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorCore.java @@ -7,7 +7,9 @@ import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -53,4 +55,24 @@ public class ReactorCore extends BlockDE { public TileEntity createTileEntity(World world, int metadata) { return new TileReactorCore(); } + + @Override + public void onBlockAdded(World world, int x, int y, int z) { + TileReactorCore tile = world.getTileEntity(x, y, z) instanceof TileReactorCore ? (TileReactorCore) world.getTileEntity(x, y, z) : null; + if (tile != null) tile.onPlaced(); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) { + TileReactorCore tile = world.getTileEntity(x, y, z) instanceof TileReactorCore ? (TileReactorCore) world.getTileEntity(x, y, z) : null; + if (tile != null) return tile.onStructureRightClicked(player); + return false; + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block p_149749_5_, int p_149749_6_) { + TileReactorCore tile = world.getTileEntity(x, y, z) instanceof TileReactorCore ? (TileReactorCore) world.getTileEntity(x, y, z) : null; + if (tile != null) tile.onBroken(); + super.breakBlock(world, x, y, z, p_149749_5_, p_149749_6_); + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorEnergyInjector.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorEnergyInjector.java new file mode 100644 index 00000000..4690647d --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorEnergyInjector.java @@ -0,0 +1,101 @@ +package com.brandon3055.draconicevolution.common.blocks.multiblock; + +import com.brandon3055.brandonscore.common.utills.Utills; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.blocks.BlockDE; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorEnergyInjector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +/** + * Created by Brandon on 23/7/2015. + */ +public class ReactorEnergyInjector extends BlockDE { + public ReactorEnergyInjector(){ + this.setCreativeTab(DraconicEvolution.tabBlocksItems); + this.setBlockName("reactorEnergyInjector"); + + ModBlocks.register(this); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister iconRegister) { + blockIcon = iconRegister.registerIcon(References.RESOURCESPREFIX + "transparency"); + } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess access, int x, int y, int z) { + TileReactorEnergyInjector tile = access.getTileEntity(x, y, z) instanceof TileReactorEnergyInjector ? (TileReactorEnergyInjector) access.getTileEntity(x, y, z) : null; + if (tile != null){ + switch (tile.facingDirection){ + case 0: this.setBlockBounds(0F, 0.885F, 0F, 1F, 1F, 1F); break; + case 1: this.setBlockBounds(0F, 0F, 0F, 1F, 0.125F, 1F); break; + case 2: this.setBlockBounds(0F, 0F, 0.885F, 1F, 1F, 1F); break; + case 3: this.setBlockBounds(0F, 0F, 0F, 1F, 1F, 0.125F); break; + case 4: this.setBlockBounds(0.885F, 0F, 0F, 1F, 1F, 1F); break; + case 5: this.setBlockBounds(0F, 0F, 0F, 0.125F, 1F, 1F); break; + } + } + super.setBlockBoundsBasedOnState(access, x, y, z); + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + TileReactorEnergyInjector tile = world.getTileEntity(x, y, z) instanceof TileReactorEnergyInjector ? (TileReactorEnergyInjector) world.getTileEntity(x, y, z) : null; + if (tile != null){ + switch (tile.facingDirection){ + case 0: this.setBlockBounds(0F, 0.885F, 0F, 1F, 1F, 1F); break; + case 1: this.setBlockBounds(0F, 0F, 0F, 1F, 0.125F, 1F); break; + case 2: this.setBlockBounds(0F, 0F, 0.885F, 1F, 1F, 1F); break; + case 3: this.setBlockBounds(0F, 0F, 0F, 1F, 1F, 0.125F); break; + case 4: this.setBlockBounds(0.885F, 0F, 0F, 1F, 1F, 1F); break; + case 5: this.setBlockBounds(0F, 0F, 0F, 0.125F, 1F, 1F); break; + } + } + return super.getCollisionBoundingBoxFromPool(world, x, y, z); + } + + @Override + public int getRenderType() { + return -1; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { + int d = Utills.determineOrientation(x, y, z, entity); + TileReactorEnergyInjector tile = (TileReactorEnergyInjector)world.getTileEntity(x, y, z); + tile.facingDirection = ForgeDirection.getOrientation(d).getOpposite().ordinal(); + tile.onPlaced(); + } + @Override + public boolean hasTileEntity(int metadata) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileReactorEnergyInjector(); + } + +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorStabilizer.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorStabilizer.java index c2ebee07..063fe1e6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorStabilizer.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorStabilizer.java @@ -5,9 +5,11 @@ import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.BlockDE; import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorCore; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorStabilizer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; @@ -60,8 +62,19 @@ public class ReactorStabilizer extends BlockDE { @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { int d = Utills.determineOrientation(x, y, z, entity); - TileReactorStabilizer tile = (TileReactorStabilizer)world.getTileEntity(x, y, z); - tile.facingDirection = ForgeDirection.getOrientation(d).getOpposite().ordinal(); - tile.onPlaced(); + TileReactorStabilizer tile = world.getTileEntity(x, y, z) instanceof TileReactorStabilizer ? (TileReactorStabilizer)world.getTileEntity(x, y, z) : null; + if (tile != null){ + tile.facingDirection = ForgeDirection.getOrientation(d).getOpposite().ordinal(); + tile.onPlaced(); + } + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block p_149749_5_, int p_149749_6_) { + TileReactorStabilizer tile = world.getTileEntity(x, y, z) instanceof TileReactorStabilizer ? (TileReactorStabilizer)world.getTileEntity(x, y, z) : null; + TileEntity core = null; + if (tile != null) core = tile.getMaster().getTileEntity(world); + super.breakBlock(world, x, y, z, p_149749_5_, p_149749_6_); + if (core instanceof TileReactorCore) ((TileReactorCore) core).validateStructure(); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerReactor.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerReactor.java new file mode 100644 index 00000000..6a2608be --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerReactor.java @@ -0,0 +1,167 @@ +package com.brandon3055.draconicevolution.common.container; + +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.inventory.GenericInventory; +import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor.TileReactorCore; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +/** + * Created by brandon3055 on 30/7/2015. + */ +public class ContainerReactor extends ContainerDataSync { + + private TileReactorCore reactor; + private EntityPlayer player; + private GenericInventory ioSlots = new GenericInventory() { + private ItemStack[] items = new ItemStack[2]; + + @Override + public ItemStack[] getStorage() { + return items; + } + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemstack) { + return itemstack != null && (itemstack.getItem() == ModItems.draconicIngot || itemstack.getItem() == Item.getItemFromBlock(ModBlocks.draconicBlock)); + } + + @Override + public int getInventoryStackLimit() { + return super.getInventoryStackLimit(); + } + + @Override + public void setInventorySlotContents(int i, ItemStack stack) { + if (i == 0 && stack != null && (stack.getItem() == ModItems.draconicIngot || stack.getItem() == Item.getItemFromBlock(ModBlocks.draconicBlock))) + { + if (stack.getItem() == ModItems.draconicIngot) reactor.reactorFuel += stack.stackSize * 144; + if (stack.getItem() == Item.getItemFromBlock(ModBlocks.draconicBlock)) reactor.reactorFuel += stack.stackSize * 1296; + } + else getStorage()[i] = stack; + } + }; + + //Syncing //todo sort out syncing + public int LTReactorFuel = -1; + public int LTReactionIntensity = -1; + public int LTMaxReactIntensity = -1; + public int LTFieldStrength = -1; + public int LTEnergySaturation = -1; + public int LTMaxEnergySaturation = -1; + public int LTFuelConversion = -1; + //####### + + public ContainerReactor(EntityPlayer player, TileReactorCore reactor){ + this.reactor = reactor; + this.player = player; + + for (int x = 0; x < 9; x++) { + addSlotToContainer(new Slot(player.inventory, x, 44 + 18 * x, 198)); + } + + for (int y = 0; y < 3; y++) { + for (int x = 0; x < 9; x++) { + addSlotToContainer(new Slot(player.inventory, x + y * 9 + 9, 44 + 18 * x, 140 + y * 18)); + } + } + + if (reactor.reactorState == TileReactorCore.STATE_OFFLINE){ + addSlotToContainer(new SlotInsert(ioSlots, 0, 15, 140)); + addSlotToContainer(new SlotExtract(ioSlots, 1, 217, 140)); + } + } + + @Override + public boolean canInteractWith(EntityPlayer player) {//todo (the chest thing) + return true; + } + + @Override + public void detectAndSendChanges() { //todo check what values are being synced by the tile and remove them from here + if (reactor.reactorFuel != LTReactorFuel) LTReactorFuel = (Integer) sendObjectToClient(null, 0, reactor.reactorFuel); + if ((int)reactor.reactionTemperature != LTReactionIntensity)LTReactionIntensity = (Integer) sendObjectToClient(null, 1, (int) reactor.reactionTemperature); + if ((int)reactor.maxReactTemperature != LTMaxReactIntensity)LTMaxReactIntensity = (Integer) sendObjectToClient(null, 2, (int) reactor.maxReactTemperature); + if ((int)reactor.fieldCharge != LTFieldStrength) LTFieldStrength = (Integer) sendObjectToClient(null, 3, (int) reactor.fieldCharge); + if (reactor.energySaturation != LTEnergySaturation) LTEnergySaturation = (Integer) sendObjectToClient(null, 4, reactor.energySaturation); + if (reactor.maxEnergySaturation != LTMaxEnergySaturation) LTMaxEnergySaturation = (Integer) sendObjectToClient(null, 5, reactor.maxEnergySaturation); + if (reactor.convertedFuel != LTFuelConversion) LTFuelConversion = (Integer) sendObjectToClient(null, 6, reactor.convertedFuel); + + super.detectAndSendChanges(); + } + + @Override + public void receiveSyncData(int index, int value) { + if (index == 0) reactor.reactorFuel = value; + else if (index == 1) reactor.reactionTemperature = value; + else if (index == 2) reactor.maxReactTemperature = value; + else if (index == 3) reactor.fieldCharge = value; + else if (index == 4) reactor.energySaturation = value; + else if (index == 5) reactor.maxEnergySaturation = value; + else if (index == 6) reactor.convertedFuel = value; + else if (index == 20){ + reactor.processButtonPress(value == 0, value == 1); + } + } + + @Override + public ItemStack slotClick(int slot, int button, int p_75144_3_, EntityPlayer player1) { + if (slot == 37 && player1.inventory.getItemStack() == null){ + if (reactor.reactorFuel / 144 >= 64){ + int i = reactor.reactorFuel / 1296; + int i2 = Math.min(64, i); + ioSlots.getStorage()[1] = new ItemStack(ModBlocks.draconicBlock, i2); + reactor.reactorFuel -= i2 * 1296; + } + else if (reactor.reactorFuel >= 144){ + int i = reactor.reactorFuel / 144; + int i2 = Math.min(64, i); + ioSlots.getStorage()[1] = new ItemStack(ModItems.draconicIngot, i2); + reactor.reactorFuel -= i2 * 144; + } + + } + return super.slotClick(slot, button, p_75144_3_, player1); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) { + return null; + } + + public static class SlotInsert extends Slot { + + public SlotInsert(IInventory iInventory, int iSlot, int x, int y) { + super(iInventory, iSlot, x, y); + } + + @Override + public boolean isItemValid(ItemStack stack) { + return stack != null && (stack.getItem() == ModItems.draconicIngot || stack.getItem() == Item.getItemFromBlock(ModBlocks.draconicBlock)); + } + + @Override + public int getSlotStackLimit() {//todo add the fuel limit + return 64; + } + } + + public static class SlotExtract extends Slot { + + private GenericInventory inventory; + + public SlotExtract(GenericInventory iInventory, int iSlot, int x, int y) { + super(iInventory, iSlot, x, y); + inventory = iInventory; + } + + @Override + public boolean isItemValid(ItemStack stack) { + return false; + } + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java index 21c240e4..42e6dde1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java @@ -24,15 +24,15 @@ public class CraftingHandler { //Components Key[C=Corner, S=Side, M=Middle ] addOre(ModItems.draconicCore, "CSC", "SMS", "CSC", 'C', "ingotGold", 'S', ModItems.draconiumIngot, 'M', "gemDiamond"); add(ModItems.wyvernCore, "CSC", "SMS", "CSC", 'C', ModItems.draconiumIngot, 'S', ModItems.draconicCore, 'M', Items.nether_star); - add(ModItems.awakenedCore, "CSC", "SCS", "CSC", 'C', ModItems.draconicIngot, 'S', ModItems.wyvernCore); + addOre(ModItems.awakenedCore, "CSC", "SCS", "CSC", 'C', "ingotDraconiumAwakened", 'S', ModItems.wyvernCore); add(ModItems.wyvernEnergyCore, "CSC", "SMS", "CSC", 'C', ModItems.draconiumIngot, 'S', Blocks.redstone_block, 'M', ModItems.draconicCore); - add(ModItems.draconicEnergyCore, "CSC", "SMS", "CSC", 'C', ModItems.draconicIngot, 'S', ModItems.wyvernEnergyCore, 'M', ModItems.wyvernCore); + addOre(ModItems.draconicEnergyCore, "CSC", "SMS", "CSC", 'C', "ingotDraconiumAwakened", 'S', ModItems.wyvernEnergyCore, 'M', ModItems.wyvernCore); //addOre(ModItems.draconiumBlend, " D ", "DID", " D ", 'I', "ingotIron", 'D', ModItems.draconiumDust); - addShaplessOre(getStack(ModItems.draconicIngot, 9, 0), Item.getItemFromBlock(ModBlocks.draconicBlock)); - addShaplessOre(getStack(ModItems.draconiumIngot, 9, 0), Item.getItemFromBlock(ModBlocks.draconiumBlock)); + addShaplessOre(getStack(ModItems.draconicIngot, 9, 0), "blockDraconiumAwakened"); + addShaplessOre(getStack(ModItems.draconiumIngot, 9, 0), "blockDraconium"); if (ModItems.isEnabled(ModItems.draconiumIngot) && ModItems.isEnabled(ModItems.draconiumBlend)) GameRegistry.addSmelting(ModItems.draconiumBlend, getStack(ModItems.draconiumIngot, 2, 0), 1.0f); - if (ModItems.isEnabled(ModItems.draconiumIngot) && ModItems.isEnabled(ModItems.draconiumDust)) GameRegistry.addSmelting(ModItems.draconiumDust, getStack(ModItems.draconiumIngot, 1, 0), 1.0f); + if (ModItems.isEnabled(ModItems.draconiumIngot) && ModItems.isEnabled(ModItems.draconiumDust)) GameRegistry.addSmelting(new ItemStack(ModItems.draconiumDust), getStack(ModItems.draconiumIngot, 1, 0), 1.0f); //Wyvern tools @@ -50,31 +50,31 @@ public class CraftingHandler { //Draconic Tools - addEnergy(ModItems.draconicFluxCapacitor, "CMC", "SPS", "CSC", 'C', ModItems.draconicIngot, 'S', ModItems.draconicEnergyCore, 'M', ModItems.awakenedCore, 'P', ModItems.wyvernFluxCapacitor); + addEnergy(ModItems.draconicFluxCapacitor, "CMC", "SPS", "CSC", 'C', "ingotDraconiumAwakened", 'S', ModItems.draconicEnergyCore, 'M', ModItems.awakenedCore, 'P', ModItems.wyvernFluxCapacitor); //tools - addEnergy(ModItems.draconicPickaxe, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', ModItems.draconicIngot, 'T', ModItems.wyvernPickaxe, 'E', ModItems.draconicEnergyCore); - addEnergy(ModItems.draconicShovel, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', ModItems.draconicIngot, 'T', ModItems.wyvernShovel, 'E', ModItems.draconicEnergyCore); - add(ModItems.draconicAxe, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', ModItems.draconicIngot, 'T', Items.diamond_axe, 'E', ModItems.draconicEnergyCore); - add(ModItems.draconicHoe, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', ModItems.draconicIngot, 'T', Items.diamond_hoe, 'E', ModItems.draconicEnergyCore); - addEnergy(ModItems.draconicSword, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', ModItems.draconicIngot, 'T', ModItems.wyvernSword, 'E', ModItems.draconicEnergyCore); - add(ModItems.draconicBow, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', ModItems.draconicIngot, 'T', ModItems.wyvernBow, 'E', ModItems.draconicEnergyCore); - addEnergy(ModItems.draconicDestructionStaff, "IAI", "PIS", "IWI", 'I', ModItems.draconicIngot, 'A', ModItems.awakenedCore, 'P', ModItems.draconicPickaxe, 'S', ModItems.draconicShovel, 'W', ModItems.draconicSword); + addEnergy(ModItems.draconicPickaxe, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'T', ModItems.wyvernPickaxe, 'E', ModItems.draconicEnergyCore); + addEnergy(ModItems.draconicShovel, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'T', ModItems.wyvernShovel, 'E', ModItems.draconicEnergyCore); + addOre(ModItems.draconicAxe, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'T', Items.diamond_axe, 'E', ModItems.draconicEnergyCore); + addOre(ModItems.draconicHoe, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'T', Items.diamond_hoe, 'E', ModItems.draconicEnergyCore); + addEnergy(ModItems.draconicSword, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'T', ModItems.wyvernSword, 'E', ModItems.draconicEnergyCore); + addOre(ModItems.draconicBow, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'T', ModItems.wyvernBow, 'E', ModItems.draconicEnergyCore); + addEnergy(ModItems.draconicDestructionStaff, "IAI", "PIS", "IWI", 'I', "ingotDraconiumAwakened", 'A', ModItems.awakenedCore, 'P', ModItems.draconicPickaxe, 'S', ModItems.draconicShovel, 'W', ModItems.draconicSword); //armor - addEnergy(ModItems.draconicHelm, "IWI", "IAI", "IEI", 'W', ModItems.awakenedCore, 'I', ModItems.draconicIngot, 'A', ModItems.wyvernHelm, 'E', ModItems.draconicEnergyCore); - addEnergy(ModItems.draconicChest, "IWI", "IAI", "IEI", 'W', ModItems.awakenedCore, 'I', ModItems.draconicIngot, 'A', ModItems.wyvernChest, 'E', ModItems.draconicEnergyCore); - addEnergy(ModItems.draconicLeggs, "IWI", "IAI", "IEI", 'W', ModItems.awakenedCore, 'I', ModItems.draconicIngot, 'A', ModItems.wyvernLeggs, 'E', ModItems.draconicEnergyCore); - addEnergy(ModItems.draconicBoots, "IWI", "IAI", "IEI", 'W', ModItems.awakenedCore, 'I', ModItems.draconicIngot, 'A', ModItems.wyvernBoots, 'E', ModItems.draconicEnergyCore); + addEnergy(ModItems.draconicHelm, "IWI", "IAI", "IEI", 'W', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'A', ModItems.wyvernHelm, 'E', ModItems.draconicEnergyCore); + addEnergy(ModItems.draconicChest, "IWI", "IAI", "IEI", 'W', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'A', ModItems.wyvernChest, 'E', ModItems.draconicEnergyCore); + addEnergy(ModItems.draconicLeggs, "IWI", "IAI", "IEI", 'W', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'A', ModItems.wyvernLeggs, 'E', ModItems.draconicEnergyCore); + addEnergy(ModItems.draconicBoots, "IWI", "IAI", "IEI", 'W', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'A', ModItems.wyvernBoots, 'E', ModItems.draconicEnergyCore); //Blocks //storage - add(ModBlocks.draconiumBlock, "III", "III", "III", 'I', ModItems.draconiumIngot); - add(ModBlocks.draconicBlock, "III", "III", "III", 'I', ModItems.draconicIngot); + addOre(ModBlocks.draconiumBlock, "III", "III", "III", 'I', "ingotDraconium"); + addOre(ModBlocks.draconicBlock, "III", "III", "III", 'I', "ingotDraconiumAwakened"); //aesthetic add(ModBlocks.particleGenerator, "RBR", "BCB", "RBR", 'R', Blocks.redstone_block, 'B', Items.blaze_rod, 'C', ModItems.draconicCore); - add(ModBlocks.infusedObsidian, "BOB", "ODO", "BOB", 'B', Items.blaze_powder, 'O', Blocks.obsidian, 'D', ModItems.draconiumDust); + addOre(ModBlocks.infusedObsidian, "BOB", "ODO", "BOB", 'B', Items.blaze_powder, 'O', Blocks.obsidian, 'D', "dustDraconium"); //machines addOre(ModBlocks.potentiometer, "ITI", "QCQ", "IRI", 'I', "ingotIron", 'T', Blocks.redstone_torch, 'Q', "gemQuartz", 'C', Items.comparator, 'R', Blocks.redstone_block); @@ -84,18 +84,18 @@ public class CraftingHandler { //machines adv - add(ModBlocks.resurrectionStone, "CSC", "SMS", "CSC", 'C', mobSoul, 'S', ModItems.wyvernCore, 'M', ModBlocks.draconiumBlock); - add(ModBlocks.energyStorageCore, "CCC", "SMS", "CCC", 'C', ModItems.draconiumIngot, 'S', ModItems.wyvernEnergyCore, 'M', ModItems.wyvernCore); - add(ModBlocks.weatherController, "RIR", "TPT", "IEI", 'R', Items.blaze_rod, 'T', Blocks.tnt, 'P', ModItems.draconicCore, 'I', ModItems.draconiumIngot, 'E', Blocks.enchanting_table); - add(ModBlocks.playerDetectorAdvanced, "ISI", "EDE", "ICI", 'I', ModItems.draconiumIngot, 'E', Items.ender_eye, 'S', new ItemStack(Items.skull, 1, 1), 'C', Items.compass, 'D', ModBlocks.playerDetector); - add(ModBlocks.energyInfuser, "IPI", "CEC", "ICI", 'I', ModItems.draconiumIngot, 'P', ModBlocks.particleGenerator, 'C', ModItems.draconicCore, 'E', Blocks.enchanting_table); - add(ModBlocks.draconiumChest, "IFI", "SCS", "IWI", 'I', ModItems.draconiumIngot, 'C', ModItems.draconicCore, 'S', getChest(), 'W', Blocks.crafting_table, 'F', Blocks.furnace); - addOre(getStack(ModBlocks.energyPylon, 2, 0), "IEI", "MCM", "IDI", 'I', ModItems.draconiumIngot, 'E', Items.ender_eye, 'C', ModItems.draconicCore, 'D', "gemDiamond", 'M', "gemEmerald"); - addOre(getStack(ModBlocks.grinder, 1, 3), "IXI", "DCD", "IFI", 'I', "ingotIron", 'X', ModItems.draconiumIngot, 'D', Items.diamond_sword, 'C', ModItems.draconicCore, 'F', Blocks.furnace); + addOre(ModBlocks.resurrectionStone, "CSC", "SMS", "CSC", 'C', mobSoul, 'S', ModItems.wyvernCore, 'M', "blockDraconium"); + addOre(ModBlocks.energyStorageCore, "CCC", "SMS", "CCC", 'C', "ingotDraconium", 'S', ModItems.wyvernEnergyCore, 'M', ModItems.wyvernCore); + addOre(ModBlocks.weatherController, "RIR", "TPT", "IEI", 'R', Items.blaze_rod, 'T', Blocks.tnt, 'P', ModItems.draconicCore, 'I', "ingotDraconium", 'E', Blocks.enchanting_table); + addOre(ModBlocks.playerDetectorAdvanced, "ISI", "EDE", "ICI", 'I', "ingotDraconium", 'E', Items.ender_eye, 'S', new ItemStack(Items.skull, 1, 1), 'C', Items.compass, 'D', ModBlocks.playerDetector); + addOre(ModBlocks.energyInfuser, "IPI", "CEC", "ICI", 'I', "ingotDraconium", 'P', ModBlocks.particleGenerator, 'C', ModItems.draconicCore, 'E', Blocks.enchanting_table); + addOre(ModBlocks.draconiumChest, "IFI", "SCS", "IWI", 'I', "ingotDraconium", 'C', ModItems.draconicCore, 'S', getChest(), 'W', Blocks.crafting_table, 'F', Blocks.furnace); + addOre(getStack(ModBlocks.energyPylon, 2, 0), "IEI", "MCM", "IDI", 'I', "ingotDraconium", 'E', Items.ender_eye, 'C', ModItems.draconicCore, 'D', "gemDiamond", 'M', "gemEmerald"); + addOre(getStack(ModBlocks.grinder, 1, 3), "IXI", "DCD", "IFI", 'I', "ingotIron", 'X', "ingotDraconium", 'D', Items.diamond_sword, 'C', ModItems.draconicCore, 'F', Blocks.furnace); addOre(ModBlocks.playerDetector, "ITI", "CEC", "IDI", 'I', "ingotIron", 'E', Items.ender_eye, 'T', Blocks.redstone_torch, 'C', Items.comparator, 'D', ModItems.draconicCore); addOre(getStack(ModBlocks.generator, 1, 3), "NIN", "IFI", "NCN", 'N', Items.netherbrick, 'I', "ingotIron", 'F', Blocks.furnace, 'C', ModItems.draconicCore); addOre(ModBlocks.dissEnchanter, "PIP", "ETE", "CBC", 'P', Items.ender_eye, 'I', Items.enchanted_book, 'E', "gemEmerald", 'T', Blocks.enchanting_table, 'C', ModItems.draconicCore, 'B', Items.book); - addOre(getStack(ModBlocks.energyCrystal, 4, 0), "IDI", "DCD", "IDI", 'I' , ModItems.draconiumIngot, 'D', "gemDiamond", 'C', ModItems.draconicCore); + addOre(getStack(ModBlocks.energyCrystal, 4, 0), "IDI", "DCD", "IDI", 'I' , "ingotDraconium", 'D', "gemDiamond", 'C', ModItems.draconicCore); addOre(getStack(ModBlocks.energyCrystal, 4, 1), "CRC", "RWR", "CRC", 'R' , getStack(ModBlocks.energyCrystal, 1, 0), 'W', ModItems.wyvernCore, 'C', ModItems.draconicCore); addShaplessOre(getStack(ModBlocks.energyCrystal, 1, 0), getStack(ModBlocks.energyCrystal, 1, 2), getStack(ModBlocks.energyCrystal, 1, 2)); addShaplessOre(getStack(ModBlocks.energyCrystal, 2, 2), getStack(ModBlocks.energyCrystal, 1, 0)); @@ -106,14 +106,14 @@ public class CraftingHandler { //Tools - add(ModItems.teleporterMKII, "IEI", "ETE", "IWI", 'I', ModItems.draconiumIngot, 'E', Items.ender_pearl, 'T', ModItems.teleporterMKI, 'W', ModItems.wyvernCore); - add(ModItems.teleporterMKI, "CSC", "SMS", "CSC", 'C', Items.blaze_powder, 'S', ModItems.draconiumDust, 'M', Items.ender_eye); + addOre(ModItems.teleporterMKII, "IEI", "ETE", "IWI", 'I', "ingotDraconium", 'E', Items.ender_pearl, 'T', ModItems.teleporterMKI, 'W', ModItems.wyvernCore); + addOre(ModItems.teleporterMKI, "CSC", "SMS", "CSC", 'C', Items.blaze_powder, 'S', "dustDraconium", 'M', Items.ender_eye); addOre(getStack(ModItems.safetyMatch, 1, 1000), " O ", " S ", " ", 'O', "dyeOrange", 'S', "stickWood"); add(ModItems.safetyMatch, "MMM", "MMM", "MMM", 'M', getStack(ModItems.safetyMatch, 1, 1000)); - addOre(ModItems.wrench, " ID", " RI", "C ", 'I' , ModItems.draconiumIngot, 'D', "gemDiamond", 'R', Items.blaze_rod, 'C', ModItems.draconicCore); + addOre(ModItems.wrench, " ID", " RI", "C ", 'I' , "ingotDraconium", 'D', "gemDiamond", 'R', Items.blaze_rod, 'C', ModItems.draconicCore); //Other - addOre(ModItems.infoTablet, "SSS", "SDS", "SSS", 'S', "stone", 'D', ModItems.draconiumDust); + addOre(ModItems.infoTablet, "SSS", "SDS", "SSS", 'S', "stone", 'D', "dustDraconium"); addShaplessOre(getStack(ModItems.enderArrow, 1, 0), Items.arrow, Items.ender_pearl); addShaplessOre(new ItemStack(Blocks.dirt), Item.getItemFromBlock(Blocks.sand), Items.rotten_flesh, "treeSapling", "treeSapling", "treeSapling"); addShaplessOre(new ItemStack(Blocks.dirt), Item.getItemFromBlock(Blocks.sand), Items.rotten_flesh, "treeLeaves", "treeLeaves", "treeLeaves"); @@ -121,7 +121,7 @@ public class CraftingHandler { //Disable able //if(ConfigHandler.disableSunDial == 0) - add(ModBlocks.sunDial, "IAI", "CDC", "IEI", 'I', ModItems.draconiumIngot, 'A', ModItems.awakenedCore, 'C', ModItems.draconicCore, 'E', Blocks.enchanting_table, 'D', Blocks.dragon_egg); + addOre(ModBlocks.sunDial, "IAI", "CDC", "IEI", 'I', "ingotDraconium", 'A', ModItems.awakenedCore, 'C', ModItems.draconicCore, 'E', Blocks.enchanting_table, 'D', Blocks.dragon_egg); //if(ConfigHandler.disableXrayBlock == 0) addOre(getStack(ModBlocks.xRayBlock, 4, 0), "SGS", "GDG", "SGS", 'S', Items.nether_star, 'G', "blockGlassColorless", 'D', "gemDiamond"); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/inventory/GenericInventory.java b/src/main/java/com/brandon3055/draconicevolution/common/inventory/GenericInventory.java new file mode 100644 index 00000000..c50a8b1e --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/inventory/GenericInventory.java @@ -0,0 +1,99 @@ +package com.brandon3055.draconicevolution.common.inventory; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +/** + * Created by brandon3055 on 31/7/2015. + */ +public abstract class GenericInventory implements IInventory { + + public abstract ItemStack[] getStorage(); + + @Override + public int getSizeInventory() { + return getStorage().length; + } + + @Override + public ItemStack getStackInSlot(int slot) { + return slot < getStorage().length ? getStorage()[slot] : null; + } + + @Override + public ItemStack decrStackSize(int i, int count) { + ItemStack itemstack = getStackInSlot(i); + + if (itemstack != null) + { + if (itemstack.stackSize <= count) + { + setInventorySlotContents(i, null); + } else + { + itemstack = itemstack.splitStack(count); + if (itemstack.stackSize == 0) + { + setInventorySlotContents(i, null); + } + } + } + return itemstack; + } + + @Override + public ItemStack getStackInSlotOnClosing(int i) { + ItemStack item = getStackInSlot(i); + if (item != null) + setInventorySlotContents(i, null); + return item; + } + + @Override + public void setInventorySlotContents(int i, ItemStack itemstack) { + getStorage()[i] = itemstack; + if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) + { + itemstack.stackSize = getInventoryStackLimit(); + } + } + + @Override + public String getInventoryName() + { + return ""; + } + + @Override + public boolean hasCustomInventoryName() + { + return false; + } + + @Override + public int getInventoryStackLimit() + { + return 64; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) + { + return true; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public void markDirty() { + + } + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemstack) { return true; } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/CustomSpawnerBaseLogic.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/CustomSpawnerBaseLogic.java index f9348b86..f87aa177 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/CustomSpawnerBaseLogic.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/CustomSpawnerBaseLogic.java @@ -4,6 +4,7 @@ package com.brandon3055.draconicevolution.common.tileentities; * Created by Brandon on 5/07/2014. */ +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; @@ -18,6 +19,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import java.util.Arrays; + public abstract class CustomSpawnerBaseLogic { /** * The delay to spawn. @@ -191,6 +194,11 @@ public abstract class CustomSpawnerBaseLogic { public void readFromNBT(NBTTagCompound par1NBTTagCompound) { this.entityName = par1NBTTagCompound.getString("EntityId"); this.spawnDelay = par1NBTTagCompound.getShort("Delay"); + if ((!ConfigHandler.spawnerListType && Arrays.asList(ConfigHandler.spawnerList).contains(this.entityName)) || (ConfigHandler.spawnerListType && !Arrays.asList(ConfigHandler.spawnerList).contains(this.entityName))) { + this.entityName = "Pig"; + ((TileCustomSpawner)getSpawnerWorld().getTileEntity(getSpawnerX(), getSpawnerY(), getSpawnerZ())).isSetToSpawn = false; + } + powered = par1NBTTagCompound.getBoolean("Powered"); spawnSpeed = par1NBTTagCompound.getShort("Speed"); requiresPlayer = par1NBTTagCompound.getBoolean("RequiresPlayer"); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java index 3d7b3a7c..51c46ffc 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java @@ -146,7 +146,7 @@ public class TileGrinder extends TileObjectSync implements ISidedInventory, IEne @SuppressWarnings("unchecked") public boolean killNextEntity() { if (worldObj.isRemote) return false; - if (fakePlayer == null) fakePlayer = FakePlayerFactory.get((WorldServer) worldObj, new GameProfile(UUID.randomUUID(), "[Draconic-Evolution]")); + if (fakePlayer == null) fakePlayer = FakePlayerFactory.get((WorldServer) worldObj, new GameProfile(UUID.fromString("5b5689b9-e43d-4282-a42a-dc916f3616b7"), "[Draconic-Evolution]")); killBox = AxisAlignedBB.getBoundingBox(centreX - 4.5, centreY - 4.5, centreZ - 4.5, centreX + 4.5, centreY + 4.5, centreZ + 4.5); killList = worldObj.getEntitiesWithinAABB(EntityLiving.class, killBox); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java index 0423bfb7..e2cab70e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java @@ -329,4 +329,14 @@ public class TileEnergyPylon extends TileObjectSync implements IEnergyHandler, I public double getMaxEnergyStored() { return getMaster() != null ? getMaster().getMaxEnergyStored() : 0D; } + + @Override + public long getExtendedStorage() { + return getMaster() != null ? getMaster().getEnergyStored() : 0L; + } + + @Override + public long getExtendedCapacity() { + return getMaster() != null ? getMaster().getMaxEnergyStored() : 0L; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java index ea762a47..629385cf 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java @@ -23,9 +23,9 @@ public class TileEnergyStorageCore extends TileObjectSync { protected int tier = 0; protected boolean online = false; public float modelRotation = 0; - private double energy = 0; - private double capacity = 0; - private double lastTickCapacity = 0; + private long energy = 0; + private long capacity = 0; + private long lastTickCapacity = 0; private int tick = 0; public TileEnergyStorageCore(){ @@ -605,28 +605,28 @@ public class TileEnergyStorageCore extends TileObjectSync { tile.setMaster(new TileLocation(xCoord, yCoord, zCoord)); worldObj.setBlockMetadataWithNotify(stabilizers[i].getXCoord(), stabilizers[i].getYCoord(), stabilizers[i].getZCoord(), 1, 2); } - double capacity = 0; + long capacity = 0; switch (tier){ case 0: - capacity = 45500000D; + capacity = 45500000L; break; case 1: - capacity = 273000000D; + capacity = 273000000L; break; case 2: - capacity = 1640000000D; + capacity = 1640000000L; break; case 3: - capacity = 9880000000D; + capacity = 9880000000L; break; case 4: - capacity = 59300000000D; + capacity = 59300000000L; break; case 5: - capacity = 356000000000D; + capacity = 356000000000L; break; case 6: - capacity = 2140000000000D; + capacity = 2140000000000L; break; } this.capacity = capacity; @@ -692,7 +692,7 @@ public class TileEnergyStorageCore extends TileObjectSync { super.writeToNBT(compound); compound.setBoolean("Online", online); compound.setShort("Tier", (short)tier); - compound.setDouble("Energy", energy); + compound.setLong("EnergyL", energy); for (int i = 0; i < stabilizers.length; i++){ if (stabilizers[i] != null) stabilizers[i].writeToNBT(compound, String.valueOf(i)); @@ -703,33 +703,34 @@ public class TileEnergyStorageCore extends TileObjectSync { public void readFromNBT(NBTTagCompound compound) { online = compound.getBoolean("Online"); tier = (int)compound.getShort("Tier"); - energy = compound.getDouble("Energy"); + energy = compound.getLong("EnergyL"); + if (compound.hasKey("Energy")) energy = (long) compound.getDouble("Energy"); for (int i = 0; i < stabilizers.length; i++){ if (stabilizers[i] != null) stabilizers[i].readFromNBT(compound, String.valueOf(i)); } - double capacity = 0; + long capacity = 0; switch (tier){ case 0: - capacity = 45500000D;//000 + capacity = 45500000L;//000 break; case 1: - capacity = 273000000D;//000 + capacity = 273000000L;//000 break; case 2: - capacity = 1640000000D;//000 + capacity = 1640000000L;//000 break; case 3: - capacity = 9880000000D;//000 + capacity = 9880000000L;//000 break; case 4: - capacity = 59300000000D;//000 + capacity = 59300000000L;//000 break; case 5: - capacity = 356000000000D;//000 + capacity = 356000000000L;//000 break; case 6: - capacity = 2140000000000D;//000 + capacity = 2140000000000L;//000 break; } this.capacity = capacity; @@ -753,7 +754,7 @@ public class TileEnergyStorageCore extends TileObjectSync { public int receiveEnergy(int maxReceive, boolean simulate) { int maxReceive1 = Integer.MAX_VALUE; - double energyReceived = Math.min(capacity - energy, Math.min(maxReceive1, maxReceive)); + long energyReceived = Math.min(capacity - energy, Math.min(maxReceive1, maxReceive)); if (!simulate) { energy += energyReceived; @@ -763,7 +764,7 @@ public class TileEnergyStorageCore extends TileObjectSync { public int extractEnergy(int maxExtract, boolean simulate) { int maxExtract1 = Integer.MAX_VALUE; - double energyExtracted = Math.min(energy, Math.min(maxExtract1, maxExtract)); + long energyExtracted = Math.min(energy, Math.min(maxExtract1, maxExtract)); if (!simulate) { energy -= energyExtracted; @@ -771,11 +772,11 @@ public class TileEnergyStorageCore extends TileObjectSync { return (int)energyExtracted; } - public double getEnergyStored() { + public long getEnergyStored() { return energy; } - public double getMaxEnergyStored() { + public long getMaxEnergyStored() { return capacity; } @@ -786,11 +787,11 @@ public class TileEnergyStorageCore extends TileObjectSync { private void detectAndRendChanges(){ int diff = (int)Math.abs(lastTickCapacity - energy); - if (diff > 1000) lastTickCapacity = (Double) sendObjectToClient(References.DOUBLE_ID, 0, energy, new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 20)); + if (diff > 1000) lastTickCapacity = (Long) sendObjectToClient(References.LONG_ID, 0, energy, new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 20)); } @Override public void receiveObjectFromServer(int index, Object object) { - energy = (Double) object; + energy = (Long) object; } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorCore.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorCore.java index 39829f3f..b71f1e27 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorCore.java @@ -1,17 +1,208 @@ package com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor; -import net.minecraft.tileentity.TileEntity; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.client.gui.GuiHandler; +import com.brandon3055.draconicevolution.common.blocks.multiblock.IIsSlave; +import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper.TileLocation; +import com.brandon3055.draconicevolution.common.tileentities.TileObjectSync; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; /** * Created by Brandon on 16/6/2015. */ -public class TileReactorCore extends TileEntity { +public class TileReactorCore extends TileObjectSync { + public static final int MAX_SLAVE_RANGE = 10; + public static final int STATE_OFFLINE = 0; + public static final int STATE_START = 1; + public static final int STATE_ONLINE = 2; + public static final int STATE_STOP = 3; + + public int reactorState = 0; public float renderRotation = 0; + public boolean isStructureValid = true; + public boolean isActive = true; + public float renderStartProgress = 0F; //todo go from 0 to one when the reactor is starting and from 1 to 0 when the reactor is stopping (to control render transitions) + //Key operational figures + public int reactorFuel = 0; + public int convertedFuel = 0; //The amount of fuel that has converted to chaos + public double conversionUnit = 0; //used to smooth out the conversion between int and floating point. When >= 1 minus one and convert one int worth of fuel + + public double reactionTemperature = 20; + public double maxReactTemperature = 10000; //Todo make this dependent on the fuel amount + fuel conversion + + public double fieldCharge = 0; + public double maxFieldCharge = 200; //Todo make this dependent on the fuel value + + public int energySaturation = 0; //Todo make this the energy buffer that the generation dumps into and that the stabilizers extract from + public int maxEnergySaturation = 10000; //Todo make this dependent on the fuel amount, This is the max RF/t output when at 0% saturation + + public int startupEnergy = 0; //Used when starting. startup energy needs to reach max startup energy for the reactor to start + public int maxStartupEnergy = 0; //Todo make this dependent on the fuel level //maby just use saturation for startup... + //####################### + + + public List stabilizerLocations = new ArrayList(); @Override public void updateEntity() { if (worldObj.isRemote) renderRotation += 0.2F; +// if (!worldObj.isRemote) { +// renderRotation += 0.05; +// +// reactionTemperature = (int)(((1D + Math.sin(renderRotation)) / 2D) * (double)maxReactTemperature); +// +// fieldCharge = (int)(((1D + Math.sin(renderRotation + 1)) / 2D) * maxFieldCharge); +// +// energySaturation = (int)(((1D + Math.sin(renderRotation + 2)) / 2D) * (double)maxEnergySaturation); +// +// convertedFuel = (int)(((1D + Math.sin(renderRotation + 3)) / 2D) * (double)reactorFuel); +// } + } + + public void validateStructure(){ + boolean updateRequired = false; + LogHelper.info("validate"); + + //Check that all of the stabilizers are still valid + Iterator i = stabilizerLocations.iterator(); + while (i.hasNext()) { + TileLocation location = i.next(); + if (!(location.getTileEntity(worldObj) instanceof TileReactorStabilizer) || !((TileReactorStabilizer) location.getTileEntity(worldObj)).masterLocation.isThisLocation(xCoord, yCoord, zCoord)) { + i.remove(); + updateRequired = true; + } + } + + + if (updateRequired) worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + + public void onPlaced(){ + for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS){ + boolean flag = false; + for (int i = 1; i < MAX_SLAVE_RANGE && !flag; i++){ + TileLocation location = new TileLocation(xCoord + direction.offsetX * i, yCoord + direction.offsetY * i, zCoord + direction.offsetZ * i); + if (location.getTileEntity(worldObj) != null){ + if (location.getTileEntity(worldObj) instanceof IIsSlave && !((IIsSlave) location.getTileEntity(worldObj)).getMaster().initialized) ((IIsSlave) location.getTileEntity(worldObj)).checkForMaster(); + flag = true; + } + } + } + } + + public void onBroken(){ + for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS){ + for (int i = 1; i < MAX_SLAVE_RANGE; i++){ + TileLocation location = new TileLocation(xCoord + direction.offsetX * i, yCoord + direction.offsetY * i, zCoord + direction.offsetZ * i); + if (location.getTileEntity(worldObj) instanceof IIsSlave && ((IIsSlave) location.getTileEntity(worldObj)).getMaster().compareTo(new TileLocation(xCoord, yCoord, zCoord)) == 0) ((IIsSlave)location.getTileEntity(worldObj)).shutDown(); + } + } + +// for (TileLocation location : stabilizerLocations) { +// LogHelper.info(location.getTileEntity(worldObj)); +// if (location.getTileEntity(worldObj) instanceof TileReactorStabilizer) ((TileReactorStabilizer) location.getTileEntity(worldObj)).shutDown(); +// } + } + + public boolean onStructureRightClicked(EntityPlayer player){ + if (!worldObj.isRemote) player.openGui(DraconicEvolution.instance, GuiHandler.GUIID_REACTOR, worldObj, xCoord, yCoord, zCoord); + return true; + } + + public int injectEnergy(int RF){ + return 0; + } + + public void processButtonPress(boolean start, boolean stop){ + + } + + //Getters + public double getCoreDiameter(){ + double volume = (double)reactorFuel / 1296D; + volume *= 1 + ((double) reactionTemperature / (double) maxReactTemperature) * 10D; + return Math.cbrt(volume / (4/3 * Math.PI)) * 2; + } + + @SideOnly(Side.CLIENT) + @Override + public AxisAlignedBB getRenderBoundingBox() { + return INFINITE_EXTENT_AABB; + } + + @Override + public Packet getDescriptionPacket() { + NBTTagCompound compound = new NBTTagCompound(); + + NBTTagList stabilizerList = new NBTTagList(); + for (TileLocation offset : stabilizerLocations){ + NBTTagCompound compound1 = new NBTTagCompound(); + offset.writeToNBT(compound1, "tag"); + stabilizerList.appendTag(compound1); + } + if (stabilizerList.tagCount() > 0) compound.setTag("Stabilizers", stabilizerList); + + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, compound); + } + + @Override + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { + NBTTagCompound compound = pkt.func_148857_g(); + + stabilizerLocations = new ArrayList(); + if (compound.hasKey("Stabilizers")){ + NBTTagList stabilizerList = compound.getTagList("Stabilizers", 10); + for (int i = 0; i < stabilizerList.tagCount(); i++){ + TileLocation offset = new TileLocation(); + offset.readFromNBT(stabilizerList.getCompoundTagAt(i), "tag"); + stabilizerLocations.add(offset); + } + } + + super.onDataPacket(net, pkt); + } + + @Override + public void writeToNBT(NBTTagCompound compound) { + super.writeToNBT(compound); + + NBTTagList stabilizerList = new NBTTagList(); + for (TileLocation offset : stabilizerLocations){ + NBTTagCompound compound1 = new NBTTagCompound(); + offset.writeToNBT(compound1, "tag"); + stabilizerList.appendTag(compound1); + } + if (stabilizerList.tagCount() > 0) compound.setTag("Stabilizers", stabilizerList); + } + + @Override + public void readFromNBT(NBTTagCompound compound) { + super.readFromNBT(compound); + + stabilizerLocations = new ArrayList(); + if (compound.hasKey("Stabilizers")){ + NBTTagList stabilizerList = compound.getTagList("Stabilizers", 10); + for (int i = 0; i < stabilizerList.tagCount(); i++){ + TileLocation offset = new TileLocation(); + offset.readFromNBT(stabilizerList.getCompoundTagAt(i), "tag"); + stabilizerLocations.add(offset); + } + } } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorEnergyInjector.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorEnergyInjector.java new file mode 100644 index 00000000..187605ae --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorEnergyInjector.java @@ -0,0 +1,150 @@ +package com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor; + +import cofh.api.energy.IEnergyReceiver; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.client.render.particle.ParticleReactorBeam; +import com.brandon3055.draconicevolution.common.blocks.multiblock.IIsSlave; +import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.common.util.ForgeDirection; + +/** + * Created by Brandon on 23/7/2015. + */ +public class TileReactorEnergyInjector extends TileEntity implements IIsSlave, IEnergyReceiver{ + + public float modelIllumination = 1F; + public int facingDirection = ForgeDirection.UP.ordinal(); + public MultiblockHelper.TileLocation masterLocation = new MultiblockHelper.TileLocation(); + public boolean isValid = false; + public int tick = 0; + private ParticleReactorBeam beam = null; + private TileReactorCore core = null; + + @Override + public void updateEntity() { + if (worldObj.isRemote && isValid){ + beam = DraconicEvolution.proxy.reactorBeam(this, beam, true); + } + } + + public void onPlaced() { + checkForMaster(); + } + + public boolean checkForMaster(){ + for (int i = 1; i < 10; i++) { + ForgeDirection dir = ForgeDirection.getOrientation(facingDirection); + int x = xCoord + (dir.offsetX*i); + int y = yCoord + (dir.offsetY*i); + int z = zCoord + (dir.offsetZ*i); + if (!worldObj.isAirBlock(x, y, z)) + { + TileEntity tile = worldObj.getTileEntity(x, y, z); + if (tile instanceof TileReactorCore) + { + masterLocation.set(x, y, z); + isValid = true; + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + return true; + }else { + isValid = false; + return false; + } + } + } + isValid = false; + return false; + } + + @Override + public boolean isActive() { + return isValid; + } + + @Override + public void shutDown() { + masterLocation = new MultiblockHelper.TileLocation(); + isValid = false; + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + + @Override + public Packet getDescriptionPacket() { + NBTTagCompound compound = new NBTTagCompound(); + masterLocation.writeToNBT(compound, "Master"); + compound.setInteger("Facing", facingDirection); + compound.setBoolean("IsValid", isValid); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, compound); + } + + @Override + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { + NBTTagCompound compound = pkt.func_148857_g(); + masterLocation.readFromNBT(compound, "Master"); + facingDirection = compound.getInteger("Facing"); + isValid = compound.getBoolean("IsValid"); + super.onDataPacket(net, pkt); + } + + public TileReactorCore getCore(){ + if (core == null || core.isInvalid()) { + if (getMaster().getTileEntity(worldObj) instanceof TileReactorCore) core = (TileReactorCore)getMaster().getTileEntity(worldObj); + else core = null; + } + return core; + } + + @Override + public void writeToNBT(NBTTagCompound compound) { + super.writeToNBT(compound); + masterLocation.writeToNBT(compound, "Master"); + compound.setInteger("Facing", facingDirection); + compound.setBoolean("IsValid", isValid); + } + + @Override + public void readFromNBT(NBTTagCompound compound) { + super.readFromNBT(compound); + masterLocation.readFromNBT(compound, "Master"); + facingDirection = compound.getInteger("Facing"); + isValid = compound.getBoolean("IsValid"); + } + + @Override + public MultiblockHelper.TileLocation getMaster() { + return masterLocation; + } + + @Override + public AxisAlignedBB getRenderBoundingBox() { + return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + if (simulate) return Integer.MAX_VALUE; + else if (getCore() != null) return getCore().injectEnergy(maxReceive); + return 0; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return 0; + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return Integer.MAX_VALUE; + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return from == ForgeDirection.getOrientation(facingDirection).getOpposite(); + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorStabilizer.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorStabilizer.java index faba31f5..97811a99 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorStabilizer.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorStabilizer.java @@ -1,5 +1,9 @@ package com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.reactor; +import cofh.api.energy.IEnergyProvider; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.client.render.particle.ParticleReactorBeam; +import com.brandon3055.draconicevolution.common.blocks.multiblock.IIsSlave; import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper.TileLocation; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -9,9 +13,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; /** - * Created by Brandon on 5/7/2015. + * Created by brandon3055 on 5/7/2015. */ -public class TileReactorStabilizer extends TileEntity { +public class TileReactorStabilizer extends TileEntity implements IIsSlave , IEnergyProvider{ public float coreRotation = 0F; public float ringRotation = 0F; @@ -22,6 +26,7 @@ public class TileReactorStabilizer extends TileEntity { public TileLocation masterLocation = new TileLocation(); public boolean isValid = false; public int tick = 0; + private ParticleReactorBeam beam = null; @Override public void updateEntity() { @@ -33,6 +38,7 @@ public class TileReactorStabilizer extends TileEntity { coreSpeed = 30F; ringSpeed = 5F; modelIllumination = 1F; + if (isValid) beam = DraconicEvolution.proxy.reactorBeam(this, beam, true); } } @@ -41,23 +47,48 @@ public class TileReactorStabilizer extends TileEntity { checkForMaster(); } + public void onBroken() { + + } + public boolean checkForMaster(){ for (int i = 1; i < 10; i++) { ForgeDirection dir = ForgeDirection.getOrientation(facingDirection); int x = xCoord + (dir.offsetX*i); int y = yCoord + (dir.offsetY*i); int z = zCoord + (dir.offsetZ*i); - if (worldObj.getTileEntity(x, y, z) instanceof TileReactorCore){ - masterLocation.set(x, y, z); - isValid = true; - worldObj.markBlockForUpdate(x, y, z); - return true; + if (!worldObj.isAirBlock(x, y, z)) + { + TileEntity tile = worldObj.getTileEntity(x, y, z); + if (tile instanceof TileReactorCore && ((TileReactorCore) tile).stabilizerLocations.size() < 4) //todo add check reactor side to make sure this aligns with other stabilizers + { + ((TileReactorCore) tile).stabilizerLocations.add(new TileLocation(xCoord, yCoord, zCoord)); + masterLocation.set(x, y, z); + isValid = true; + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + return true; + }else { + isValid = false; + return false; + } } } isValid = false; return false; } + @Override + public boolean isActive() { + return isValid; + } + + @Override + public void shutDown(){ + isValid = false; + masterLocation = new TileLocation(); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + @Override public Packet getDescriptionPacket() { NBTTagCompound compound = new NBTTagCompound(); @@ -91,4 +122,35 @@ public class TileReactorStabilizer extends TileEntity { facingDirection = compound.getInteger("Facing"); isValid = compound.getBoolean("IsValid"); } + + @Override + public TileLocation getMaster() { + return masterLocation; + } + + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return 0; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return 0; + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return 0; + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return from == ForgeDirection.getOrientation(facingDirection).getOpposite(); + } + +// @SideOnly(Side.CLIENT) +// @Override +// public AxisAlignedBB getRenderBoundingBox() { +// return INFINITE_EXTENT_AABB; +// } } diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index cf14acbd..7ef28c82 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -414,6 +414,8 @@ button.de.BaseSafeAOE.name=AOE Safe Mode button.de.VerticalAcceleration.name=Vertical Acceleration button.de.EffectiveOnSprint.name=Effective while sprinting button.de.GogglesOfRevealing.name=Magical Sense +button.de.reactorStart.txt=Initiate Startup +button.de.reactorStop.txt=Initiate Shutdown //Gui ---------------------------------------------------------------------------------------------------------------------------------------- gui.de.flowGate.name=Flow Control @@ -426,6 +428,20 @@ gui.de.decrement.name=Decrement value by gui.de.ctrlAndShift.name=You can use Ctrl and Shift to change the increment amount. gui.de.pressOrScroll.name=Press Or Scroll +gui.de.insert.txt=Insert +gui.de.extract.txt=Extract +gui.de.fuel.txt=Fuel +gui.de.coreMass.txt=Core Mass +gui.de.reactionTemp.txt=Reaction Temperature +gui.de.fieldStrength.txt=Containment Field Strength +gui.de.energySaturation.txt=Energy Saturation +gui.de.fuelConversion.txt=Fuel Conversion Level +gui.de.status.txt=Status +gui.de.status0.txt=OFFLINE +gui.de.status1.txt=STARTING +gui.de.status2.txt=RUNNING +gui.de.status3.txt=STOPPING + manual.de.pigmenBloodRage.description=Don't let the pigmen see you eating pork you wont like what happens.. //Potions ---------------------------------------------------------------------------------------------------------------------------------------- diff --git a/src/main/resources/assets/draconicevolution/textures/gui/Reactor.png b/src/main/resources/assets/draconicevolution/textures/gui/Reactor.png new file mode 100644 index 0000000000000000000000000000000000000000..2c4ca5477b73fb0b62170360c70dd35619a8d498 GIT binary patch literal 23187 zcmV*7Kytr{P)uJ@VVD_UC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$Or zQF$}6R&?d%y_c8YA7_1QpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv z1)yUy0P^?0*fb9UASvow`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q z{wNRKos+;6rV8ldy0Owz(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E`vOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G4 z1dM~{UdP6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4E zs0sQWIt5*Tu0n&*J!lk~f_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+ zAA{TB3-ERLHar49hi4Ih5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=nat zP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+edD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVbnL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0 zWMyP6Wy582WNT#4$d1qunl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8d zZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iu ztvy=3T65Yu+7a4Yv^%sXb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i z^lS773}6Fm1Fpe-gF!>Ip{*g$u-szvGhed;vo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*Z zvFf(^Xl-N7w{EeXveC4Ov)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx z)P8cQ&Qi|OhNWW;>JChYI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_W zICNY@+|jrX%s^&6b2i>5eqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!q zl}XcFH*PieWwLj2ZSq`7V9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I- z?$tAVKYn8-l({mqQ$Q8{O!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;c zwT88(J6|n-WB%w`m$h~4pmp)YIh_ z3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dl zbFb#!9eY1iCsp6Bajj|Hr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syT zu9enWavU5N9)I?I-1m1*_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$m zU2Q)a|9JSc+Uc4zvS-T963!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;; zJuhGEb?H5K#o@~7t9DmUU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX z=)z6+o0o6-+`4{y+3mqQ%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@ z>;2q1Vm)$Z)P1z?N$8UYW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHs zy69KwU-!MxeeuI@&cF4|M9z%AfP?@5 z`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u010qNS#tmY4#EHc4#EKyC`y0;000Mc zNliru-v=KSG7g7@IX3_RAOJ~3K~#9!?7dl#U00T#_wBvU&6{&3keFwJ14s}Yz?m!- zt61!=>Mp4#wXL>7Fa6+fND+QFH=_F8)1^-)by~S&< zz1DjKdspvT$JammXa6iEfv>xY{GBfg{%4+f=DPf1ufF=~P5J)4t9Sivu5Z%)Ui`9O z`1Di1{VV;T*IxheP5u78t9Sivu5ZfyuKzY){D=SipYn(Q{GYDdukT&Gt9QTu9T7nH z_4B{}U%&G6-+lgn{?#(vYk%_98T9Gj>D{5d>xNxxeLt=>Vz}-J0Ay_+aofA;de^OV zt?do@SoXHMfq&JnkN`Ss`?wj4~Xj}fZlZ*Uges8 z_dQ?p`CBgmqzGLj1##yl;Gy2tyKd5nG;)*vs$U@iwAXXOy{#@yi-ww^(6cnuJVq^G zSjDI%lxm}Cp%4^;3mMg6a5NFuhov9uMkw77){WAU4RqW_gl6x-y@3fpt*->|RS$@} z)gSM5ef6m+`t${wdXhdhO=0IT^Yb+3<|*dqFpCSADPBZ~!|zNI5)0IX;4n4bmlo|?gFFh4*_)6n*n{AetnjvzCdGfhQ5oFG$$|7oSMWeEK)W`D2q`nBedCul_9JhM9L;2O+*S@ zc)FDqlyuP2!E}}|%S#lqix{;)zdK7|7ciYgWORVe#5nCOTWD|JOlNchE3$_b*~hZI z6GvYU0eoXi0N1|pkM}o>4;a*+F4WfBDj#QwNe|yJM z4HVnk6!Qx-&s=0!jzYhpy<-cjyLZysvyEkY2TS&DmgPV%0etf~fHgj%zo8sJp=KC1 zM;Xwk=$o2m@Z<@GKL3P{+DNrcK zI>&+ti=7TDoerI{M8s=1j4|{T1^q?AP*E^uEn}SyW6R5I>~z>*Efdx*I@};MDRm(r$g_ z_qXCe94HXya83{uSC*GJca5*_@9$?VXydCmgI2L||LV1QF)Nqcdj9^h6$DHNcz3e}PZ z@7u@WCmv?_)JJSS{+}7W;~j<$A7g&-Ar|bzly0n-0KVc{hh2bjZJ_@*fCCsWUS~uf zVd(v1j30T6`N0R7IrCjkesYFSC%@pRwY)Vjz$?qkl(RGb;jk91G)ie2jfM|!tx!s% zbsqEzLh$E7@85Pw2cR4Q2ZU$OM?TI~9~CD!2_K7PgZPASYH@*6z|TyVKKqOh zPo3hxo;^JN*bf;w_deTB{zpddd6(%Y&$1wgSg;S>CMCf2?|P~JUI}p9BY**Yk`2YH z44wLz@i*UOl^sl7`92q3zR2;5AMi$5@?x{eyHk^}w1_bURvbDz;kDM`)YoXG@Q1zz z?Sozi6yVcA0FdfxK&i6uk0(AjM8e0N!-?RG|GX3D6GHg7b+KGfygfh1+ra%JBRqQg zG+&%Q&%wLy;?UuPjGa8f&Qt%2`3Da(eecD<5A5h6fU8KCUIMtS6TpVzB}QBCu;HaQ zFc;^UYd^vC`z4>B{gjuMm-#Qi$5&<(#MfE_mPS$dlVAH2Un^a`pCtmcKjl>r`e;Q$ z0zRVs*SoG0ECsuZ<$y;5l3x20KL)-ya3bh{4kU<+M1+rKruhgsG_i?iPn_V?*|Xe# z*InH6P|3*K?=yJn1XEA{kon<9nYV{~37~d5tlJX6^%B5WTzzVijg6l(dg2{6y!I+f z#l6fPdw@?r|D1QPT;bn|@b2{G6!^wyilTwm3a$N#9|K-%T_u44|9!AmTtJls2poXA z3I#+lFpe4ua31%Ew{z$pkb#p>7HH28L{uOSD}so{iSXg{Wj+L++_ae&-hZF77dG?Q z!57$MK4izA{#%9~{*=ChmzXObqvJO95sb6VY>u*_c$p1<^9p@m zTw-?lSw26q#HZ(v@JAy2#q2EBmg&SViUO@o2z-S$CIx#;1~JI}+rIu!r@mI{q>tSI z57Jd60ulwNT#W%h#KlbDogSRvgbMaM7f3;ev*KHcB3S1IM%rpb6e12Q7I3_Ad5R;A zK7Mn4p2?SA=7ID3Ir!K%MvlBs|Kxd^-<#x0`8Z4VzIDa{^bi0&A<)+meXlaU_&O6m z|0(72I5Q`|%PSvz$g6X6{4sELeh%>MyTTM`qcK|hpw|ke{cEEQN-2!isPLi#^jC^n zQm9@?WMD-D#P?l#Rn`8462Nx>VhIpyf3F$v(BCP zjlW>S*;kl&@#id<2RZqRAzu6Bb$%?u&lVPNPEybnMS(Vk!ua4eI-L4Oca;DE_Uj7% zYvs!Uv_j(vLEjC~wJv~C%KxyuFX+Ij)c?x@-zNr*%WD4&0fg7}w{`khL<3e?L`Zn%PxD%C4kP_K>u}| z05q#?>iaV`e)0-qZ@kH@dX{(pW}bIGdyjvkHOGQ@M?}!tP!vAkl`$A?FeXBMlU^GW zPJ68}F#&WDfxa7{KHc zR%5N#ELdw0@I5Nbjp%K7Z_7ujKLTm z=<&4=_>cgM!laYmBpyIzq@Yng=yO3(3Vv0A{)z~hk zLi-OW-RLd$441tGP=_S4wk5zi;sAW`|AdWi|D3^3zToow3%v96sZ8f7a$( z-+GKu{Vrqfb@W5aoNN8zEv6pqaR6NizMXmOFBEG<>RU*sphMw@~{YfNEMkQaqPtAGeHBoNtu9Z*1}1uzx#k4XVi zLO|uhpt|}$F9ag_=jVY!u*Y_v_{l+W0@}CyTpsw&A=YMzK%tZ%)(5@>1frG2T0mJ; zStTheCGB>L|JN8=fc)$&UijVi@V7N&xrGO91o|0Gk?r&cYT={MW@r+U*ur97SQO;MWDl=s*Al6p#Ww zd@j7Ljqm@P2>*jNARz>G4PlV-2_droX(m8L=&vdTAS#3YSt~Hi0r-G72$2Ac#9!nC z1giyYEus`EBmiZ7LJ+YD>MJE!3o0yY z-_-t-Fb^P+<@dpFMbIK>v53})SWog_?Mt1@1KL=2W?$@20N z|E_<4fw?&betwE4zkis~pB_Pew@JHiGc)CPdkLV20B-KprzROI-el9y|B8j;VNSfO z`1!?){Og&S1p7^4Fs7&wKs@cg;w6fK>SSPeUuUAAbn<7Vz%^Qd5GMt@$-u74HTL~u z5=aU_2?(IB0npvVpXfmHS+uoS6-Yp3v)?Ch09b77P1>A@0B0Q5!s_Y@|9*6gvB^nB zUh3z87w%;E=bs>dzrl*^Wkv3|1v!9U{c4+D0=RanE~$u^Fh zc#nU%yv*|I3f2myh{3J{0x%({BNFgsK%uMhAlC!b-qr>cO9LHAL6Z#z>1r@YYjhw1 z2_wSlOG<#~0F-k9E|vsN!YFVS_%5OV@x6W#oU>T#1wcw$FZ$6MWi3|XOoCJ%1=*xx zo`7<-0t##i)AMuue;X&*@WmI5y!ilkKRLqSYhSSS$sh5>>i=|GB7nA8)28}5>;l|^ z2w=Q;l?}&Vp?T^Om!^J;w~xNgzbs28gRb9%Q``r32zXuiATM+c1r)}hV_9G-Vo(QO zpdtig(CbP!kV%6h8c5|p)BT69Vcd{`A-v@82sGt;gBA z=Ra|&{d+eF0jyn!w$>d2kZU9Wcl#!Qetn9OmG{~3=BvzfzRN4`9N~{wSD94GkMVZ1 z{MiZb13YU5CjI}l%7MBfuu2M5{jaq4odKgzDiVYW;-F9@+jKZ_UELihf4-cmq`#g7 ztXzNMxUV>e4y?Zx!HUI2#y`M*MG*UlRLH}UtjSbqQAPL7lF5~8eMy5YOJ1A4%#N{f zM&AE`U*G)zW3RkTXWIsr%snjH`)@l0u+B;VS)<6mH50&C@eUI|`x#5-9zJ+|kyodt z_=|-FL~Om5FTB)O7ZnOf!Csh}8ZdrL>ms2CT~i50axmutDp|13#6Y##0Ii^FAjm`T ztOL+B2;@Bbmjpnb0F1qU35vf+0*0wStq`p}`>#vi`V$F+qXfKBRzYqZP*f;Hl^Bdi zA^sIcyW~P7V)@h6RrYi`Y<_)-Cw^@YL$80##CLzzO8`9*@J0szFBm=XHpSEelb;>t zz0Y3b$9PGrZ}%1H#4n7l$iD#PW6&2m3;rUM2iHOYIwXbw|4ot!=Tc!^cL*|ZA}~sV zb$u*YfpRq~&=mZY6gc<(%cQ^BOMjI(lvuC-7mKnQ!E*q%jAWm`FD$n5B2kJGFyS-) zC#qTpDLEB69rhMFTnVk#DnFUn#Ew&^xZ{f#*k%8cq0f)AY44wNx$}eDh6HTgehEO| z773tGR~S+sv*E4Rm}@=GD<6HtpBDvZgNu&|YQ1>UYg1G$yo3O>PXa|(YcPFGXUITf zbb$_>fj{|8(gvth4%E8=(I+4ZgV1CITweXh^SIvrOA5e92)b(8&x!M9A4(9V5iKd; zMaP<7uu}cZ_+S0UR_`bNA)Nf$_=IDO|M?;gqaCFPpG;rorHvD8I&y^H*!>V=Z@tav z9Xps;hiSVlJp^!5NI?0L1mJG31TbpeWBjc*Xv-FkztiUZnHgRU$Bl)RVe+UjL3k8Yi6IGS=P&^U7;#uB`HRIx z4z}Cudv7m~JhG9YBcHPI;g`7B{%?8-;MPO{jdh;@n(6{WE1xoY^gX7hU*O2+@9|gt z{j5x1##%?w$V56R_#+x9GRbd|K5oJcfYC(~26?2QuUQJ{Bq9nwL*-K8t{H)=6oGXu z0A!qi%f^0*Q-G26&qsfC*T9dL`FhshPxwjH_Sd=(_0!*~RCG|yBgV4B!+wtlGA)AE zU^IfE)o$_A(NT7N@(Fhye2Oja|7Qm8J;p%sIV-Y%{g(j6x=R4EhAn_=B;1>z2N*6s zVC>Cbu++Gl58gY^JDm>iFD_uM^+BCY^d(C#9U;HIO6ZfnUlcm~c$5fNWr9x>Q5hKJ z!9_3)F_k8u<{OYH0=2rj1c)60KoSfP9Lo3q#igFV%cQ?nEY3>O{41rlJy5Cux5yTlxDnkq!hjD%`A(D~C3D#-ex;(`rW8>_7`vTv7b{`{0jdrQo}E@MkDN>xu}Bo&klhjUaUcdU&Le^N zV#4V!p#^Dt3G&JGWj-3;z#VTL=ey6}!O;8173e*9@hx7CQ+BBZXD})Y!qA>8YNNa+>kjD9(~mAd8AlLi2Xxc~6q#Dk zf%&&fzt)Kld zgO8n{p)RlSj)BgaCV+L<2E3i6z$4};!$*&?+P9bE$EJ8sgt-9!lXqXYb8ifKr7{Fy zlB%!Jg`Wa6xn7{V9T+}eTx)npC&5tq-tp%fgHfIv@Vi2Eatp4Uc zv8e^#4ZI<{&*)!moNpa+0CMe*yY-&{ z2J|V0KRwFA>;oLTc#Kz#VSawjkNGx&SD&efH=UpCc`}Hne*ShBlsB0qxG?p(fY>&S zgG0K|_3l6@9klXfppKT}u>^>70U-gTQXo?T*7X0`{y%Lk;sk4h_$STyd+4v!)f0xk zk8ditUu4Th9GGM};t4;e!|CrdPW$(@aTxImLnoChk~0b=2BjR%mAu<*a{tMbJaqV8 z#*e?r;Dg7RW-Svyj|2EdlmNr#DE${t<64^8%&D|&OydhL}20sf=w7YaRIp>fad_Zd;q(~enn}o z{SPO<4K`m|`QT3`AGSWxmu3!gfsqUKJqGRK>F!&Nk?0d0VZSEoNhfdI{jxNB{%+bB0bFXT|O1kj1l0i6vGRU^bjk+&AREyZ=sJT&(R z$jLxdSA))ZwqCAU|E+N1NkA`kmde*p6s1xWnde}xD2!s?*i|4f`xp~MM%AhBod3JU zI8;awBK~no0k0)&NbAeI$+O(Mi$Bwc8zC8?l_Blh_kF8+>==lNsawWj^ zsspZ-aPvD@U;hU~)1qIWXW)y^nYr*h=jP9Iq}>j+f3=e@C;jRsotbx^Hdk{5xqwHT zK>B4$L2VM;FJhap);-941x(foH0El<5UtZ}Kt2x;bpR+=ll{g$fYIw;ix2o{>Fp=| zyuLq@em1yzIO3MbVlpJ4q7|Bix0OMKM4**782b=- z=JI7$X1~p5`upSOac`bU}{93F%?m$i|q5U-Y?={P;r%*D0K*QwO26Og;&30uF6xX zM<4e9B=uih{2_wX4rg_!{Us58HrV-CY_b;f0bh3)ayU$?^`pkX_xQzWjPWR=I_;y+ zVLa`_=kkP`O+YHGQKI<#@)T!>hWYH{%WQaRg#ObP8QOk)jV1+qB|!Z!zS%;cHAn#c z`V0f7PqU(Sac*XY*R*D3WjUPwCc9CqlU{{VAYbQ|oO=U7mpTVJD-H7T-Y!m{aucdZ zzaq^M=&W0i`38jVle_|=Ccvm{K&NU0N*=J$@yBKaU>NeTe!{1=V6<8<9&Vpl3W%ws zyn)=SSbgnTe^)_#rCq4&BWjU4f=MNnCk0dRhao8EET8rF^ZD7cJirc`r_V94^W+*O zfL;mEg#cs?TL3qQ18C|C^q)D$%e1dUV641^QdoCmSjPXcAJB(3?WUWkzgr7>2jVbtb zcn(6sRa%2sjsutH=4fBJhw;9*XzGi-EPan^=`I@?+XX+dnQxDv{x8FquR-8bt5X{PeZh3G_0@{x-gB#i*f7aTSM>PWD7# z`p1oEd8X>)&RQu%Db6k~GVL6fPg=%Dp>O^&&HnSW+>TxXSX&a%uG!&#a}vNgninT& z7h9N`o#k!i2W0&IO?{R3p3YCBzz1lun>B~AU0(iGCqZ{j6Y8t>2AX)dd6WtA zU4wQW;u{mn0qxM*X1<2u_f-;3d|x6M?H7ya3~kjnBWo0zR%?|rBcq%=caA-ePSAI8 zn*KXa(<*nYs~fV_vjn@j381Mj(s%I^opKXXb8~zex*YY*JE|hqhy+^~JXKVPAl~HY zI)7j?1d;pyn=EimH8PwhhJ3`h$P^l_o=nQ?LVfR?ulbb=kY05Wd-1e48YQ|0=@Sx2C0E8}=*-_B%p54~4M)%R^>J}- zj!Bs6pbqP=*RwU{-MkVM#}8GyR=mkx_P%B;n! zvH_yR`V$O9jh`TNp{~za{i>zs5*o@a%ybRX>)LYD_%WrrmZ54@;|Jp3bVh{vR*Qn8 zIn)3EAOJ~3K~!>jkpA(rG}Y7%ydmB7O8{yeC4jGY1X`nny9N)EW(iX+ViuMuC!5SH zEit>aR1tt)U|+H6v9*@ftJQX%szy!07s>~cZC8#MbT-UWPXa1y@6}a<`EEf!M^Nn_ z$i7ZhR$+u7OJ<ZpD!Y1K(>euYXB3T%^0;Z;0P{|f7@7aquoOr`ezui}1vjrZ$rytBZw8IqM z#3RCb9iY6HOsHcj5-=j8^!HNzt@&E>RNG^-WKbcOJh>7@PWU~9PApT+Aui6$Fj|aY z=9g&>Ut~q@?3Dn$65yAC|FaZxOO$GunS})|WH(*9`N$SqQaRrw-F+$*NP$nZ=F-{6 zRn^DNd)m3u&}7?xRWcn3C!UEDhgk<9n!|P zYS<@$(W&d40D3xrukHe@=LDeVF!S?R8D?f_iK!I$biw`Tuv2LPDie%YCTLJPr3e+@ zuJHxbcmo|rcx&svGeJ){F)KHqqT&j2MPc_CaV-HvoA62n=&irJ<(CSZd{vp%a+x=u zZ&ijqz0rPRuj_Z#nK7x(1O7`Em)1X5=K(y)T1Q^Fzd_#B0GKHX=36bSY{V=sQK&1| z_a0f}-Jt7kHQ4Qh017ovF~3OJ8E0YT3Re;VmIZ9waHGjaVKYRKf;t|e^;KPYjjOX8 zJ{ot_{QOKl)T6Q!wCW<5?4_CttWORW!GJVw4^m2HO#m0%el1EgqAaSkS)ace-4*8z zLY&bU(TJ)~ANsmJ4^#u%`rny4)K^)8t35tG+QZ`!A4i=C$lPO8DOKA!2rz35E7l^N z0gA;d6l!5zC4knt90vN*l;ze{0?@2tmX_%(Pq5N%vka<0n-&KR`yd zRW(E%E#!$L?=UEx@eJLhV@8T)U4>liV|0B$s2U@#b{51FHMRh)I7C@WrEn_T3=;bK zQpt9;&NTd)Xomp*3B(?GyA*|0c(N|l`h-#=dn{^BLb`g;vm}^zU&tAl?CDr6OFAOB zC52vTqp$P*b0bQCue!{wmH@bo5`dzOZnaShjrb ziIhksa+0hAlKq}m`;JH+*t)xXO36}Zz66S#PW6eyCk!&k@2KV6Ya%g#g-(YOP)nd& z9hADh5xdq1;Ok0&!CSHfxC-@OKN_P+3wMK*5t3r3AUE`2Ld~{WdYpTCBJpfsPB-QeCl~mcj0-|+!Uhk_E^fga|44yfl(dhH=-xyf7 zsLu6Y<$bdez^#`6ZXg0!^F*M$?;S1Q?y|uYvoQX~b*h^afG&^Cbi1V+*JUTG>LRbm zeEL-l)K*av8T&3GkxYwF_4o5h#Q1rW*^(F4sxka1u(h6NaiN9hL}9xIZ)zwdFM+yA zIF;FsWyz|_kFNf2RTk8$3iPaY${w4pP}#$`BIxw;1* z+39<&7F*?2=%@9R_FjL{1z0BnQzy1PNbGAJkb1JZ>L5m`EIrnOzwRNBu$0TchRRc* zmR(iyFr+Kt){t0q9RlxB=&paH_PPMw6~I?KAZ`s3z?vq4%H9SQZl=mREB-xI3(YC$ z!nC1np3mI7=)jrAa4SRpJcv~~THG~~O-u|fF4R_}w{uhxfB)q8kzQi#{uI zuO9H-3C=@zmuC*;uF9(EcgZOjm$R1DqS2!8yAfQUAzMVaZb-mh0=S7?07v0B(e`7S-wPy0VNT4D7hN>81;tePdGb6Mfac zh|_(!&9}7zlxP&<9M($m0F)>SN}GbKL==Bs+$K!=xJti=%m3Ic*i(vhS@37MMa93n zmS}2GUQ50Xm!Yp}^_VdQg;o?=W5)(?#$5M;{YE2zTYfc|+(rpNXyA$h2EZtPBdI=3 zr_-qpnywSbb^YH5Lj_@DDp1)nu6i2C0?H+TUtinp{MqU24)PV%GdZ?1D2skU6^Ap`kSlYFtAj?)sWWt~CkR>LGx?T>`kCh)i4)*XTnH`Hi$q zrMR-ZREMUHY{y-lk5VZSxY}u7E#VX#MH;H{H+uE8{(hF~dr0N3>wWez?|$OS?EHil zoU=IbmRrtR&*)q4=@(H*C8h}{z7?!3k$?tlumtly0a=+K0^%*ht7RWjC9g;-b}byO z*^XztfU7-LF4>FKQ)K?XuGFdARY&AVQFt@(0gLM^kn3y>{&fi8SME8eb(R1k0&urM z0&w(U2L@o!(ol*at^GVecKW+4$W^?_(`g&`Y~=9X)lO)ng36M^UXkjwizlzkX795a zzJm5KU?nZ_wBpb<`uPbcn-Y@=A|I708Pgz;wOCuG;1{Wzgv9qHa}Q2SM8j*uBM;K= z?-Ek*B}qUm;;tqLUD{Dnl^yYKPXD&XczC3ftr`ayGlr%ysQwaZ_FZ=bu+|Bn;nrCK zxY-C``8p#2J2ZeEDCswbQQ%yy=5{rfy}G&c)5_QDCIv>*vUu9EQ>E`OY;mrZ$c0X6}H{r#9?89O{g>4w)83ApYOz_my~ zw@wp4=|(8WH_$W}8E-b(+-gf^xv*RwbY%13L{OKHpWw&w`~8i+~3 z*{Z|f9M1a3z-BH(F}YMFj8wJ0xEd1hC4|%yg3B4ltXojyLn^XxtF;V{j#4m7dt@u6 z8(k9wuvSE1Uk?G?yadp38|jRWVe~Rv`i9vW5kMDPFToy5x}dC|t*?9LiIY&nn#z60 zROrEFCwZ);<7#dv(Xi7y^h&DpCDi$z-H$KUQcD2o)HL42Lo1Vc>4lDi%Y)Ykw-t*m z^Wd*a0iOhHRW_s&La;7FB~HS!kqXsFLIYCcH6jucmpv}7&VxvnC~F-D>h0C-!0^Zj zMfnBGV|UVV6YC!VxLyLdAy-Q_Q;v^e%0;#f?qiR&^!E?2vbvJN^9q`hky#Z-5bIj0 zmSsr3bvLfx?m8i}fQogtIEz?sp&bKFiA9ND(y49G?fV_wspF9D8xywliouxjJt^MmFYO)76zo zOGgz@u+v(GHgBdV7bwR@Y1z%|D*?!DPy(#i1RxAi7DL$KVazUJh^BP~QV3kE%h3M*IqWnu~ZP4!f__tA7YeP_k zpiG;FY|#2ge!$h+j4>H`6d*|HgFm4FYmwA0v_VAVDz3mv4J|maIA?1dLLxI0B8bRG z(stsS_8)x+|tmmPy{$vlh`h6XJx=r=Gs` z^Y`&27r(O)<$IzL5*r=%^94VCExKl=L6RJ0r)^I5g#hYOnJyhRsSHmywJaTFOyFJoT%NiA&mvyNZI*krDa^r|C?L(~%9=|Ag+5fL~Jr zbpHW*eIc~$)R*Ku>=8j0)Z~!fRh@)u@BkIBl9Payxaa^dK0Z#+ zz41iTsqe14f}|cSDmz^x!KYC=y7mI`b*U(fqEuOX%o#-cm0T)1`-CxH?Oi*lCh;V} zYJa#|#JaQ_P{ap(nJ0rNA1KZLAw%FqyX4kdCj z{rv;n*>1CO!v^{~AF#0P5UaBLwm|@@mjG_ewJN*ljBSL5W_Vx0t_ua*`uaGzvRt+9 zTy=uyJ@8b+yA1xiK<0@~uvI5WY_V4RRa{x{DDfM4lSQ`@lqwMmmMG-0U@O37oP$Dp zwVyb&5x%WZ@C2UbtS;B zc=fY-!{Ja{wz9fwH)e5_UGEKYpwr=GVTX^ra^tQ;AS^BZK&F%Zw`s{D!qvpxdZxur*yl)j6=40|C1wy~!ltN-qJd{k3H8VRg?=j9Xyqw(Z<~QE|`a zEgYMgtjTb#6|~8QbgaWFFVeBb2Xs39L;KDug%<0#?*@x(M5Codm4V$4Nx`Omz2@pM z6X#Wa2G90~M4(Mn{)NDoYM%hv;*vOdlM;Yb?X^4!R05zXz$>Mo?+$p5z^0l%k%FaM z9q8SBhYhE>t#bkS*HrTdwyUGyQO14SwzH=!*|4jLaSN>M-N#bvz?vg~wIBlfZo4kP zI!pkLCT-cm%AWn`l~r~hAL3xA!!f9tYiQG@#dlt)BTiTSdMiFD=!(>{B3_geIRGVC zRgrvtn~<%DKC4hTQnxQR<{jX$Z19dJS3Wq8rAUQHfgrTjK9C>Teio?1r@H0Zt1xM;fon!OJ2+i%2w0Cc#C0lSb z*W}*lwE@2Y2moM3_Of{QJxrW=kppAfc<{^_emXMB^2&16#tJ?A>NFFa(lybGh($|G z2;u9?O3WkHV#AhUTUHA+%FIO6Mc*x3COqJPBIx{$cIdRbPY~m|g|wDj`MrZERk;u+ z0+5tMqCbG^79>e7{E78{toKVw$#{T-4x~OuAerfiEmJwr{WEg0Q0f%eE}}JX1Vy7k z|G)qT7Z%vPb0M* zx=OWY1FrZ-HZOPg-wxV8(AxRIBJDJy1)~k(v|k~fpntw+kZh-hs{D1te?K8t zEqX%EhL)hDQXuOJSV;;&p9ErA&|NOr+WRq~r1oN_Dy$&`>wms40c?HrIKcmh7ZrQRswX&HHrIMA^|Mfds#U6FykM*!QJ~G;ohk!U7UAR zQ_Z@@69~N*r58a#=}kHWL;(e<0!mlup^6k~0pSzrDqWC(h>A!LU3%|LdI=q*g&xvx zJnOD|&bfQ-zh>`w-kDi@&6+*){vO3!S-%I^%#18<|GJ9sH{R87Kw;At=6(9Fv>Hy1 z9zfEnOx{eb%E~(4qNA9mtSl>C4cO)#p6R(pKo<46<;zBh;hXrSzKv6r~N9>x!RhA%&H72p35D4 zbacGG{L|j3^`3}^Dd;WoST^Yp0=TY*&If+bftF^lsb znp1+c+FiXqpRtdg3`%omW8P|n#suRs*Y7mB&zRM$)`1@Sf>0Xa?&Ec5bu`=SK2@q` z`1=m0H}-e=m2K4U0yd9V@<>aC!-k>VPfbs59p+DFlNhC(PXKQ!MnQb|3neT5un%@H zqBwv3o_lhON@siNf^x{8XUbextRFp`;@Cbfy$TcjV3Ptq@BW~GH(e>blLA(W5w~JM zF~8PSB$AzRi0&vHt#br>T$zP>nIDDPUxNXu)d7r~W)uL^OzAJ_thjsgyum}y|LFDCbOmvAzIke<<$vvQZ zfW4ldcCLY&9b^)%AliQK)bX|UEd8Z~j&>JpaA0S&Qcc{cs9o?mI^TfNVu|XsTH=Wp zg{@Ok+K8vVHKnR5je^SD4VcRpKl|lhdH-0tp%qe`8vblgN2h3(o3$_X&JVOfXu9xw zr)6@fFyt%-J3Yb5l$1Q7tUkI+IFMjK412gD8;t>bWpuvP4*)^rDihA39P%jFdh+fr zWUtvkLs0(tJL*-hz0haz4^q&ZpcybIN^o8jH1Jkcsx4 zM{ML4+>w_}wh&E(D!A9gU7%yuH%J-`$BVr#ANtuX<|JsUn;XD7Krj2-l^TZvT}Juy zdMM5j?+S#tWi<2(xR#w>GBh!T@U}_cCu<~~E_hq6^p?C_e|hHem5IpBlk%&J4J+^* z6V0ToS{XMvnaS2KO8e#aW4RrswDESmCx}I>yaVGkUK`7n*MH`ieeVeYYZ#lz6Lr+0 z-L```KiXcDlv^{E6@ng5p*Y`rDgR)NLL3U4A*qAiD^5XJFqTtYMK?Y#zA^1{o7>!d?v-z1Q4bu`%i z^g;&H#@gw?>wLDN!Z>oc#zdkFpgw2gf8f=M`7_6RGPrdFY9pU4*L0)gP=j4s=3Y`J zojoD{lPDpP@v!4FM6^{o(A<^2sEI<_CRmRbq8yMi4KdhXI{7?N9Ek+`Z15pIi&N9fT5OKB8qGC|2v0v5`TQU~kyq%WpUA@XN9VYSKR)pLz~UNXfHlZf!P+ob z^5#LRHZMA<%7JeMTuk2|@$FDf5aD>&o5k`*w1)^{nnv3u^JqS74aw~$C=%nQly^q% z{8eoK10yu(85`mwY+I?;v%qik%2odGNOXJb6Defl>L_vMK@{{J(@@XBJHX>kkgqs9 zIo*ZK*0M9Dh_S4v=2ii^>9UuU_qkZM6!!AMko9tw{X(o5eT6nhqhF+GsEqBgT4Kp8 zL5zhnEo0?!JsNRiO)$eOmUkCN8W97fCH>&6bk$r!Oo6eYvfjx?Et-AZgjDE|by=u}WI5-9h zQU``1k2sUUGqa#uvM#-O&kEGT%weZ_?3WPcNG#+acD)jsDJ?d`}GAQ~ngxdi}7`MQYk@%P_@caCw z&$B^aT?PPvDeJE<0KO0@c!lM$3d4I8&|FDNNbGHmW;PSFiec2^HM-u{>ejmpnhYyR z?#lkB%Cm_@kb7|p3W~$Sc@c^;Z|sN6URyt00s$=$DZ6JY%X&1K!au(SZT-UNJNTt%TJ#)QPoa_t?`yn108h4;@8xL^)tJ27AY24R)w`ev7N47OQ7D5CyBeq=4d?BGOMK-AiPQKE$>rY<(U< zp}Un6FUU1TgaD=EJx^^Zv5*^Dvz)mZP)p%9^nkBLCW8 z(ZAZ88bNtLEh3PIp0S=eBdETMG(CGRBxcfbh0`W70yC;c?_TsvSI`^OsJr!Z>z!>n zy_xvYu9VjBjhi20ZgU9006$BmulTKrRlge|`J+sG;ihrwOi77HImX5^a6FqO648J5 z9I0Kml41iQ|I5xkJgp`tBHiC}YBrR#F$%isiItpnQz+GQagbzquk32mA z-agi!n&^pWN7yPO3*@GzZM<@o&J@}a4v@s)1fN260l|UmqtJ0P7;cZ7j0`9D&XZCw zh^(I@rq`VK@vb9%$dAd^+7fA+s4o!U+lM{H?rbKUtYQWN_eM#gK0_lXD;EdqD9O&1 zBhw82rkrdY#H!gIsv>dmMbWZ#&g(KY(9v&mh{1^Z*>9ifWvK#~_@;b4mSJ=3rj0$G zEf0N8l@)vdqy*#B7}#ifYRb}JZN-_>|~XMqeCTnWYj(&+ddk~4;8GTe`!b<*>Vva3KGo$@YrQ<8m(N_dMf22Oip++nWWLrk!p(t*x92bK z>y*NkfEKhoH0{c7zlg0GYf?XoHcM8x!p=psWs20VpdD=@3%IvZlld0J*mnN~UeZ81 zVY$g&zV#bBlVT2TWu-ZhFPKW>SI7P-;%Oj`>+3xD*JfU?PY0f0AR77C`s1VKECi4D zIjeCL=tyRmBs3>^h9B#BzOzCPmoio1&j#5wi@wTnd(0Mh&PbKc#ttUX{U)pO;tvAu(jfNJQt70C@Ooiso8n!L^7-?71|~QOeqB zR(KWJ?<*L{=Yt@xi&isYf!8KEvq!`giS|A?(UfT=w@`|5Nbmh#sg?uTMozTcL#0~R9F&ZTvQqTinEZ<|&R5tQx`R)0SRxz9#sn@SCk$x&pWBgD;mx-)z71`!Ix{3yqK3CzKwiZKkK6|znv2{<}I%R zjt#h4@%F%y=$C#qUy366Jq!(WDr|d+q$1_ZQ&Sf++`P8a+tb5k60Z{;u0HQkSu(yd z@=5L0PMNlD4>q^Bhf3T|nR>zVusM-THAy$XV zTeK(Jv1<(znl)PR{wCx9lXt#zpWIkJm;e%nLHkI|;d?utxurQ>m73HBdA^a+5xE9< zS9+CGWqC^fxT#3O>szJS6fT1wx{YEtjbbgId~FCPTb7vuJfD zAY=y7tibtvT$8%(q!ur+AN=;tux#*_{F@Qp=UpIyANkK8D_J!2L>NXNlM5x zHx8svSzNWUdb0b{t>&+(4ziDDCQJ=^=k7P10(ORc1m_#L3;br*P1;&U`ikngFZBjv zYBpH~TyRx7T2&f<9aZTRT)(>6W`Fkaj_+B!GIZi>7)r6^UEoP|gUl4j$s7IY z*1OM93Lo_mfRbpNokYV5xt7d-_+s6Zl!O(Sl_CQ=A9L+$a5aO*n!GQj{Br)(4>P;; z-Ik1xI_{DFlMQxZzmy?~7tsxO zMogLk(a&XOWjm3lo@DKW7_IZhh@V1O3C^vY6aa|i2?ij!*#fix05SkGplz!DJ5N+z zUY_numeDs^*yxn$_Fw=%KR>9g*znt=>2{_w*D2bTFQCPC``}=hnN%f`WPtnsRQ|JQ zg&1gx1(NFC95mw#FtXnM$j$J^9qgfPWkJpR)hk-hUVIM)5`cHr;+R$D+>{KsjA0JQf!Ud_H@u z`>8TupBnUkJ^Xi#|1R)m*@n8UojQcaIu;iHAbH<>yK4{s z^UUGJ#yLz#B(;B9;K}zNa%LY7@D5#TdRGsT$RN_IXw!RlyY{651k5u`+5Z7VMz!2t z2pUm&F~Xx0^=m9N&BS7Jx>si^sTI$uoQNDAX*=O=^t)kaZ|6VrNZaBzkLwkdhN+_j zH~tT1yVS|&+UU{E?9sjLO}(0smJ&vpn}B#tf56~O!iaZUqxOg;uwn=EO;USYvWWfI zw0mFbp52SueTpw>Av3@WCSd#y7|3bYTgT(_pxSty@Z(2_UFDwYLJzLG>30*Oj2ok4 z{SPs4zI$bs&HX8GI!A|SndFHK;|<1HZfCScm?a*>NH$7+93HK;&ip|!*)JTXq2 zb9>OhHMRfx%wQ0#7kljf3(<0-lv0ujB%;reYs2b3M*ChRlZ;81;x?2q&ryI#9;V2$ z66gc>y)MVoTJw%fu|;D096Bm2{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/draconicevolution/textures/gui/Widgets.png b/src/main/resources/assets/draconicevolution/textures/gui/Widgets.png index 4291faf745345227991afa43f930f32f25acfd77..9897bb7e31d1b9a8d289fe3bfd3b800063953167 100644 GIT binary patch literal 7267 zcmd^k_d8r|)b3`KL9`HE)C7qnN`wqSCc5Y)Itft|y+pJTgXogii|CS!K1Rgo%pgjN z&Pa4ohcHC%XY+pF`Q`ix=bCHJo@+mCKWp9hTKBUiMqgK*o|cOi004ST4HZKGAOnAr z0Z=ONX60Sv2;QikXsfFLr)QtMrow-~Cp4ZK<~{&G$8vU&0U22w;6rL(O&wM0DJTV- z!1bc5D`)`VUe{E)Z~S6(HQPF#xBcJFQxofuAjfC?wy{SQ7aKB7p3SPi;&FLI!TnHW zu2Ch_%;iIwsd@gFX}ecW$8VCc^fZaxuc$u@j5?zd?wGrvMQ_ElQc>F{^IqSRiA%V| zQ^{6IA$UKXb85`m8p{|`>h3qSwvoM&y^?fzDlk_Ua(Ghc^v7p8%gCgV0-%H6Y#YV8 zVa)6Y3v~9r>V;O$_13!#UVW&i7uO!VgAa%Jf6C2fbVFZ)zeeo^_C6c8dvtvC+U!RN zIl}t0BRzoUh!BnCMM>{n*N+5WK&NdHa1v%O(RH6jN zLl0LUm0`VR)&BhYOzk#O-d>=SS+3zWR{eYr>=4opiwMqb=Nb!#P>TZ>#%RpkZUEwu zEEPCJ$Z-%i6Ia0S&+}JsS9~RMx~oidGMb3~t2P;8=9@bbb_2Q2ASkS3WHB!Dqa%SE zv$WX|Kwiy`{I?I&4!gQ|=ww5+_a?KkZCvkt9y$HQy{FD|fjMc&>=tdY z$LPqE0o)?b{b2znZ=t*4s6M}byo3=j9^kegNNT{=+5}qrxellTaHxs_g?&8V@x)4r zkwk~GTY^Hb0^lN^ z*lc`A4f%`DO4mg19cC`YU9_Ud-&2?AWn2NuF%+B6}>XlpkzzkfC6Ql+uv{q%{Qupy-{W+;9^E_ zHTl0;C;zBXQLY{To0*gnnrO(ZuSH{jp;G)o&LZk)O6OG7V2&SW zkS|?FD}O5zDWg#FlFA<#0xXZg?@y}OMOHby;pD~5=^r8fHe z?sXNJY{JM6C5u_x2LIJdNsXCzo?qipmaA;&R}`m+l7<*++0uDp$>3c}oEDJ>1j8;Oas;szP!RMf3NaNomSKR6;Kjkn`c zuG~3E3OkxjHiU~s^2+;L5oq?H(_dm(u(D=ukK^z2baqvi^$KJuh2`M(-TryZ{#hJo z^!!*;cr;1R?Kvmk>FP0Au~Oa~^mTyiv{P|MGI+0zujB9h_YH!j$K&?cOKE=O*KThq z^d6Th<%!Z>LmgDp&y_~|$Dltjl%W)6ER9L_|( z>d(!0&=>Gtj$26p- z-OC{M25xUB=2cTM`5$^&BigVhUOYmH_9T;Ws{AV!zck$KYIE#d^tJLQ+z-j_YF^~) zw{(-ddpG9m*RRbl5f{`0YbI(Y+=aeZ8agCDID?g5$x^YZT7fi5lMu)7CvK|x;&fr|(z|2Dgfy+Gg-)frcs9=Y@l-8l46!xn~D{fsocXtLjRNS_i2Xu{(k5BE3 z4MD}d>4;G*aLpIE`4Ad#JiHC*+8ozAl`&!en(#H4E-Y%Fvr^YcqnO}o zofQQ}mw+soA1(V$t94yvx7CK@`uWImeGV9fRI>q4QPHjJPhN;v*gt#5HeOpG@pURPZx5ru&` zXCJbLGkNpMBSgtlymgcjF*KB7l&y*a1afo7qeE3;z@I{J?xh}CeE6;P8=0~B#uO;w zf`Z=zf_VzE6>NQ@*+TeLJkn~HS@{#KKAt1)S6!L>?>P4{(vxp`Vlkp`yL=)T9cA8{ zBIOcmucRk)=Tqs^(tTXI1KbbLL8vxZ-@c%EG4d--WSutWz-=dRm+lnQ{7;$50M*wR zY|9tq-{SkFm+ouL$U_@U!XJV=C36MZX_ev>WRokqNQ1_+$Gcrg}VKeta= z;C8ORq*M&%^jH}(V=ltWZ&AcPKW!TjM8+3GI2NRb@2jhJ84dw!jhj8~=5Lu^9In=Q z9c;N=Fe;2e5kwrsc>w@ylHYD~ui0Cyhdh!6x_f$3Z5XxxYtKr~Co^HBp^pn&bKpO1 z$q;H=7`(d~BP|DBkd@n#WsAZ{3TA|KhG!`ze`CN_SCH)%b0J?BK`q!{vC=6D=#Gi1JE&~|DLY7^x@ zvLRUHZpv2?^tI^A^t#Mo2+tG+zhz^WIbY@$kI>Cb#Rxykh(+%139N}n*)>6O%S31u zAq2KL4BQOpR^`$45dh!!DScjsNOXJE^3uxR=O|;eL0xaz(S#O&f2WtVksJ5^J$7#; zY#WAn;-9Cv=*|4Vx}}%M_%{og{0)Y1wc%YLnNZKfmvC9gXL~yMw>Q@xDF4$lKY*w= zN4U~faD>1+2FQ#Pnr?RbkF*6h!0KVyqOlbR`nxP_~<#w%`}F| z{P2%5eQE~N5yvVD%tncD!t6{7ig4qEUqoeL{>X#^&qc=So!EQf^~ z4r?kFS(x*Z7O3!BG4*)nUPaIT`$r)J;Hh*Y<~4JIxlFOzI1$DEcQE$;^W&@zq;J=5BFVVxBIuU-1jl1WLv6ykYyIBRAyzr z-o`Oi_QcvX*6E5S(_sN5Oqx0__E2c-vKWCFa0)?0<4z=il=q16Mw2$5df)aY+k_{z zT*=9SfqVLTwqPCd! za40)(?QqyL3V0WS!A`PaKE<$t@P3e(qBdG^nXE^kR_5R)ebJzc;1I_2@LxlX!J!p- zkr|#={&R#teYVh+HK_-Gl#aIs0YrDEY+CEOe?x+3Y_O~TFpc^%w;Okqs_Nukf=a4L zoL@p-eynitOYniaX)CdJ7ldsd)%0JN==03&?Sx|eEw>Z6J2b@lR+zX_L$V3m4#$uK z4EKDBZo7dgeHXWT-1;jx#O;IbEF^&Bmhmsg7UzRkSckfo%+V%K*T*shbcDP^~C+k2iK?+R&N1kX;W z6kI2#sSIC0SoPR*K23$%`TM@G>~Oyf=K^FOvj0xUROXa!sF%pZ&G+`m{tLN|*`qePGcu&}K3uXVa!Jap&_`eaU3;dWmZbt<5?7A-OC=S(pDz*cgxV1uZ}Q;#J2l+jK|?;EjTmEK3Jf z27OGoZ&_dSm(tZOq9lS$l>vY*9|%f#=NYbarz4y3SckY>-f1h2f|_Jc7Ck5T5b_%Q z`!OZS$=s%N5ILAuX|?{3p|53xHcmh^RD}oR@<6V!I${Ur81&IzjZ>cD(>JsiOstk~E7|jt3gg>43(NxLb{U}~QsP@=* z1KP!vbGTIuBoEj=Q@pS0zB5GQ<70o}@-+Yk6Jy+L0Zbgz{bb3){9o-Cb2fLKKA9KKf*%BwuGWNn7Vh7+h*SV|l`Z*B#&SGNiXhxD|i zzlZL2i^NuhO?}u+Sqt=?>W3Fz;r8Qtkg7a&IknhVXIYR8dtBnju8G=_lz(3Q!Jaz|0CR@Q!_p=?&9>TG7v^iul}DZ8n*-G zUdKJk+Qh6&0uDbJrhDW`R#~dF;WbmC+=Y6%9TI*}0ii@-GH@~bptix%*ynh+l-mtF z&YUsv0o44Z7H@coj&$pLi*3>JiapcghuJ+%9$76-IC<#`1_1{oD5<`AmU_I<^7Io9 zI9w?u$r2r8I2%(c4WgN(;M7c9PhY5*$(1y0?zRSHs=13@AvEo9Q6N6lOi;aP8`&7i zy-R-`@gdi0o|giw+msv9GDWTW6|U94X?%IFcXOa?qALtQ}O`H znGbQM9h>m0DQ|Y2Gl^ze9``x$l{~TdB6yTCgA^^ybfgO`*4lS^7$A~HLmgjI$Svn>Qpt{H$mKU#Zj&mi*I0o zvUJ;XyXjve43{1GV60*KY2-+l0qe|C$#4bXN!vSVRFI8T(?KN+nam7|D+a#uJ)isr zOU|YE#$rznt~&saIo8$StW^#XFcmT)+wB|0*>f0;jIsjN4>Gx*zjVJQrP4Rq5lfYq za;^I!vbe3n7b@^!=H)U}1!^7(MKDQq$ROIH8F!mzTKD%$HsMenrBEJeX=#pvbMpXz zZkC)uP{j3xcCUEx?*|w5kM=iFBW(i$$ao3L3c?Py$KND)#Ab{W&D6@iR}wY;@$+V9 zuiavplKdHHRG1N#8|_&)^>qWVOf(`8FI| zLHRmADOt-tn=>%&7Yz1A+hm zud@B011rdJek+85K%o3LNzI#mp=Rtkct|peC`r7e%(m-D-+YY1TvC6z7&t>w4>|qw z=UMKV3uJ(_T~O15^}D3;@~cdppH5%8y3%UC-P+y^!0;W8bu+R3+@5`aGKZj8FCX^% zy!M{Pr(Jd*0@}!>sJlF8|& zb0{yo3k-s_FMG2YSh<>3pmPIcHCOYv>d$mZ#VP4BSpNHY+~#zA0dWaGc}vN7iNcL8 zog8Ex55jVl9V|T5g%u9oe=Gd@eNmNEAE&!U(V%-xi14RF5}#G_Ih3Y{ij8VLXI{zL zpk*x3sf@dA9lZGhk2q7o*4r8YsOxNHy2CU@$ zU-XJ*_!u7otW?~p7dy;6s^Ea8p)qL%MsDJV1TG(~y$pW3;C`k$K$gCT;yFgrKghz^ zdBcUP?u6*(FHt%CUy-42{^_np@zOa@)qojTR!j_sxnq4@ojmP$-k?|MDMdd*B9sUu1l&$kFReuZ`ivtFn0?Tij(WVI5uVlnr|NL))14VT0E3!wtK zovQ~vL=^&g6}h`b&I{^`^O2v620;gOk*OG9Iy&v<$`;Azz?_wJwNN^N*4*`Km61Sh!rGC()2?i2TBP4Y*c+_7x`7^TzzdOgrD< zlf`P@NCMTT*gki+C8$2v`Bn%(>~IiyhuM#wr(h*Qp(Z`^dmeTpFpO1muC4{#?~?EB z%Cb@Eyu!^tkCO0O)8Qf`X^!+|*q?vrCNyC9lN-3QvxrbjrT>@K(3cyLC!glg@7|!s zNBa*8txuZNN0-T;Ukit0lRFXp_~X+`hE`VV@YynseKcPAJd^@rac>&B2I;Hrq^IkL zuHlAbgO_Zx*hL!{1c*MDJ6Il#Kg zZqJ$t>c}iCNQqk#{*IL0SXfPvbjFs5K!;ZpYUa;G!13bMhDhAibK2oCdd;tV7JK{> ze)5lSc^Qf1`g4E%qOv-A{P-;KJg5=U$8hVt6|N&>*| literal 5223 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 diff --git a/src/main/resources/assets/draconicevolution/textures/models/ModelReactorPowerInjector.png b/src/main/resources/assets/draconicevolution/textures/models/ModelReactorPowerInjector.png new file mode 100644 index 0000000000000000000000000000000000000000..5152837e84aa188a6f980549072301feeb012031 GIT binary patch literal 5560 zcmV;p6-VlcP)f&ail zd5*+8PY6gtf|NugQXY8V4HDuFF_t1g*is@VO1${T?s{js?>$vKRGr(mXM1+X+1=@h zaZ9s3+viSK_o+Jd<6A$ju;a%EFJE?45kT6D?H7^wwLJrl%r4Apy)F92-`x6e+~Ybo zkL$aF;V6Qt#$_t;o^w*|{kFdE>@ysDQABX}jqBVEH%A2i?O(qoyWIb7*8-rOa`fhq z8x{Mjs)&S0hzhtM5^L_DJxKD;D~y)B$8b&FiNt$UK?-PrPU3Zyf{9~3-~y{_%M#aS8zuG_jYlfZqK)JnHWT4NIUswOy9Swjok>q@4e?e(D(4rLje5B ztFLbSpYMM6zI=ets2W@0vEk;RnyOQTk_@oAK83hVA~|iN%giP;Q?S0kEl#o%?@tqi z9np7T_X6-7_!IAYAAIzq@W>-@bOf)x2H*GwS6+OPF}1;8f&U`#q5Gf-tU6j0L~xfd z!5)HvJ9QK+HIZumV!65b>@yo{E)*ryEa21ij*B2T=4)qTSM=o^NPxZz;Nr#jxqKNu z@BuhDfQuJ-7x16JKLg(d#{2OJ9JHjpm$3QXjtNGsP|Y`;!?d|>se0$fP{N0^$u7sU z<%Mn*%}-TvcsN#WjyJA|FdPcj;yQ2IxTc1$>EYi>|CMV$ z;o!nUAp|uf#0*q4Y`8+v60}4xGt3P$L&Y&O4sX24qYpo}mA+`%y#PE2$fZkR`;U&o z6!blE=@JiKy$Zk)a0tBjzI}{vj@p4xg*r;aS`yy1q?0A7Q-k@Qp_`;&IPQ+P(ULk`LUF}IuII7I{Y(e&7x8s0`9Q|fSu)#0xLj{-jrJe)hS5400p z^O#%*-T;0Ayh4BQJ=|}eNZ*=a5Dc<;1S?r?#Lp4 zNH1vx?B#3Csr(_Lhe_mC`sd-%9YHX??}PEf0LvvT798b8*YYb3_XP(~%ze$bndh8m zGo$o|#)Vce1ThP4`AintUQeM}dzYpo97U-PU78J>%gv0wsv=y-lm7^CDdDk$Wb|AE zGyy0x(E7q!!)>L14m7}HfG?NGY6XXfaTHYX<&wvM@1%0me7^Tcpdezn1vt`Fu>cfB zst5kh?8J+#86|o05iGgrfco673!>}a%?`$s}8~t;k0bT{(d+8GV=ttoMs>0Q)$fZlX`hy?P1HTE}%x$@7w5uV(cZ;AIy`#H#_Nb4bX7?F|S>Q z(G<;(dMo{NApjo);rZv``R8{7L}bE8Wev`lAIk`O9wFTn93c}s>X8VtlmPJ!3-5Tt zZ`W4X97zVAMBl3+bm{#xo8KqnyZMLA=YDowL<-@QoG=l}QG~LvVD8Ax@-kR&no=;mzjD?0Nn(UyEx+y1)od zr0?$tfG1umn_4?gWaQOo)dJqKY%?cMCcEI9Fdb`nw*f@qA7q+$!Vb6%{k#2cA+{&d zN8S+tcbS1TYlS+cU-LMwv#Y*|Ahdr(;v~-tH=3uI{)2lHI7dZsX~5BT`XO+unU`Pl z)yl2F@O&+NZ#_AV1Vfqc>n7OaKxye; zkN3VUeRJ?JRai*BLFjxxVhk7Ed`@Y(5^^I!mM&9-0L;W;@AYZIKli06w1>kqLX7e`3Zg- z`tHfl*Js{;3-z`ELG9XW@hr=<{kNh2|6KqasI^YcQZQQ9N?T;TSDBynNXbQ3%^b_9 zz~{J(NT~Q3CJ=$2B?!qc87hfON!K!DNf^-7yRGY@+A}s@G0_v-chvLBj5bW;j+F?vf$d%*(g6 zlXw#SqM+q}>Gxg;98@j<`-to#bhz{xb&QCNh^&zG1DtCt_TRv)2k%dye~vW3uBw6? zCc4IM(y?<#x;{^G5^rVuIHn2NHBa6J!4O*~UdTLw6G&f?b(z*^P*gFiC(^%h;|A}3 z_XD`!z_}TMIGJw^;nfgO)iSAjnfe^|I6ORL(Ji*p@8le5fL&DuGx>E{oRP(orf~TB zD&lAXvvlvIC3%FRVFseqD(m`nGe{Jfz{8ncPtb6N6KtdZ$i+wB8hs0S7F&P0#p0o< z-{4mI=RgBYRl!d^1;6x5kr90PW%&Bnx$@$RyaD_d@LBL*13rAOHG%nt5M&|lTXa_{URK@P7kW)@IUE13LMcpP-v$QMfE^M%%Ie%H0-zOs?vDP>q2Q}?K;q~q zia`zzrmEmW;7#DQ^l|UG03`k@(l#rONUOn@dFr%z_8vu_j?LiJ=+MzQqh<*qOQcq{ zC4i>v!p`V(9+E+=DtIzT7cRty&Z^)Mcvm_LtNVll%&T!?b9_2+lLIJi!?WVo8xSRN_sV&U|;->RN>NPnjSFjWN~97JL0;UOFzMpbY^9XDX=jJf9zGg=#- z(JFj1J*#1v*hmC9wYC~Ri<78MQO|;_#1H_{iiiOf_uPDfkw`ML1tL43e=dqbr>fvr zUV(3aJHGYx>l;h_@Oiaq&7Oq)MQV5pQJ=DkVG2r?rXQajxb(|07pWouQ zfA@EMxm+>SVf%+t4SUrLVSeNIqBhfJKB-VY<_k4OPpMsw+0wmkAXZ=}yUMD=uh2Qc$w(OO#Swii` zR2O;DezjW2u9U<9#P4LK*{s6wsXwj}nFcxd?TViL&P5PYN_MuHeup#DQpT-0Wb0;c z+pz7NX`RB7QHpF~{+vDTb9L^g;e28PZ9k5E*W*I!$An`Gkhb~$>;8z_W*mJ7B`F`g zeA(**zOL0cVH$|f;JK-Iqcu~yPg1;1#IVpT<)&h0)IHx?G^>j~_KIW8_ z^4ygxr`yxh+JG;e^14s_jN}6RBIxUTIL0`RSgqNKu`c>7Gk>5@|Dg5zjpM*r!EIb) z`KlRPw>Gbit}oOFmf*tke;z322ma!T6F=7r&tAFh=Z?Si6aMx)09^j;Z}7ABICB9I zlwlkq(Nk+oUGOQp6JE9{MU~Pkr6{Gu$6O7obk~PywQaGqD+%d`6RQqGxL}eh@^;KW z&HA1G_JwD!oSV?@d<#J8TeD<-t$A>D8oZ+g`o3p>v0(4ufPSw>RahP#aa5Kp1y-vS zb!-(m;f!kOvIiTCI@Rgk4Rha$5b#ia`wGCHJo8767&bcNFz}@>e^qX`-t|4>Fi^Te z>3aU|^M5~u0Pa~s=Q$~%gIGd+hJ+)At>H zzd%(OhamzGs|>?{*O8$iYiJH$$VQS@8!(fBKB87XJNz{$q2#O5kL){Jjx<^yVX@RXXo58!;1V z4q#}$1fmEdiV{(HVEJZ-b`3Bx)|ET=T?M=iH9!{H)M23XN*xU?>*qVIk9Bix9Rh{3 z=4OevIqr(PvRp0$5aNisS|Oz%LI}VRr+*v<%xx+SnHFvpK&W+yCXXxxb^J`3a-If1+;aiwL@9lr>b!r;>yw|9gZ4z7uJ7o& zLf`M^fXjX7ftjA0z>Q)OsGs0eEc5L>oeF*5({}~c!g6^8I93Cjca<|8#NhHaG6B#0@yEUIx~V^Z z7)ScjG1Q8?^Qlih<5TZGp_NM)j$Y|bt{f<$lv3yyJ$rk5^eF_R2*YS-S702dKJTed zCo#vX1ZrTIIi>IDyFPu0MVJpWMw|L@&(s5uW6@LJ2kfm{m`6>Y?mxNl`rm%;^K$3& zdis-n>d5uvFO#iIc!YFP*3ZY*q{LM1aj4Vtw#R2a^BGZ%{D0T=EczbpN>=1%L&iLz z+!8)hXOB+7o{CU3r+apab|uY8m!n>EnjyFo7jPCG3BEOI+IaoEX@Jjt;UBh2GU=ar#&iNVn)f%l zC^RQ|8PizK31gPXFJy)0S$E+2Y=7#wVsNL5 z?(8)9v3YT`#JE|^@C}ALbsVT;=!a@HwTs83=Cg|e?sk99Z4}TRi^U=!-lM~4t-cck zd~D5d#yTP^82g@a94RGAr`j;3HmQsgPVl-w$*67&W7OQOh84@zk~$1{*JrqRhT~Y> z?s|XDy#O?bx4N=OU*L8S@bNWqqgF?3WLPdU95UP`@%@$<+E)G&Om_rKsOAhq8{puq zRx5^KV5nns;d+mrVH2La-}U~S8v%Iw=_h?}(Pw|6jw8*v{otMm$EjRuFfGuB9;vv*!E*w!^9yDjRv9@bhYhewmeqN88*?CwXx9{+N+j8^QWGx!)G;|843Zq1RM9cS5sC3@=pJ8^$@EdV}N2KT7L%T`w#!cGqv z!=GloTXb93qUkOhHqy4_U38}U_^7duj-f7LUR9_9Wh{&`Zi&FdL2OzeGK_wvH)ay? zQ}5r2`*X$*-41I6PaE=?fOY;(LvLNMbaTmSxx@y?YfRiy!f90L z)}5Tm{J1@v-?8TZUZsQM7B+XcKf4bDB_?l;gQE*as8a`x5tX^8S&!bjTi0-->x1F0 zipvUWrC6DD=VSqKb;fa=QUP@w@#?si93&YXM(detZTdoue!W?);Du+e+=IrD+yAX+ z+u2?1&lx{%q4?xS{=mmN#ssXq=|Y=@GuDx=bev`#x~*$J_~DPS3wf(HS@*9^E%v&; zhfs73Yu>pdTs)i9KgTAB9_s)Wr@I-Ul`R~}Cf62wtVamSESI#tU-7!@*lwlAwvJ<` zTNNIE?2)_LpRa!H8)qs7(H*>6MqItsNJvh{n#b5No4-xVSohtf*Sk%^q}?`kvn_Yq zoE$lRt^0c7=E*Mjouyo4#^}wQ)5eg8F99>daDh3#=3*~Ea=_e?|1hR&i?^D52SMxZ$f4O0000VGd000McNliru-v<`~FC>4D0p|b!5?o0{ zK~#9!tzFx09LEu@>0MIdO}t3F=uTOP;#e0`awOY|0|&@U0_4F#5Fk(ai+n{sBna{t zAV2~HHtYoPRT6cBfyA;ciKHc7MT(-x<<8{6({%B$PIa%61{T~M&h&IwSDiX_rnxMt zsv3}V3*>kKpQl9R203?1M5c}Fe6-pADkQSwV>VyXAG~^Kc96t=_%)Tji4reDPcKp;_TO1l|+%&ws%2KEq>lJ5BmKj5j-M z#2dPJH{56(jMQ>g;v@L{3OVlp@xne5cE^lk4K>C?fQw`v2LU00kwP8Vi1lfdv`HaCm3K4l8iBLSSsBSPw zQquw)-!>-QP?J9DWQFI1;hN zwWIZ%VrV=i{jH+4bu2vs@Y)X(k1LLyUrmIF*Y>HhwIGPD+erO$%is}(8fPr7&ck_I z9*8}Jn>N+T=;I4;>|i3!J-~cgFG!29PBEBd0iJ8kDX6e6l#!p|$ps04AR@zLFc08( z4gd*R*_Hb9v&6))k6G~KZB_SI;4v{Y3K99cPJYtk=1g40P@)(Y#*oC4-Oq8qT3y68x3l0m$7#Y4kMH<}m~Djf90ZZ*LZ;y5bf!usC(*Qlr@7g2{P6B{!kul$>kM}@mJYxnZG6x-0{4%=w zS!Q1qOi+*EHW|~HL$V4IGJ28T^(K|8uUqv%r?PaRa&`QCz5}MHGnH-^45nD5SY^l< zur5U-@pzF*YrNQk0rlhzHqrVBRmQnQV-+a_G}NG5Mx0-8u03xM5j`Qy-KR1P_&i~d zVTWs6f<@oKJ<9;Ef>d6>fJ=wWpz6a0jJm>0@cEo`4fBoz4(g8^-V&Grh737u*^r<{ ziJJ$*9kF4q?k6CL%8rLmkth7zK>ag>hZNSMu``BspBVD?afq!cL)>63RVH^CSTN^+ zW}%p3x1j?d@%p|6g25?#HjQJWpvH73n4WGojZ#>9&_PuI#Yr!Vt@{U6{RQQre3act(tX)FrtX6|818D2d zIBBOlp#j9#4~gVGqQI+AMNe!m8~v|?akQ7LfWcbm_C*40Ho!;%A}S(z3nqSnAa_4u zb&(g05HC7S#)x691>eF->rG=|YowA230%DhSs`R;9##|8YmbgUHjaG=wM+!vN>_u!Wb(NJ<&qOJhsiZeym(Om z{FIF8QD%x|V_mk0P`^_t-cFRsg@}BiKHo_2^k~#;BvWh%e?}NXqp2|LYKH~d(^NH> zqswDfm~;ATIy|5-3Z_)aeI2l868extsob^<@I(#je1;n#aC!80%isdRDS7X7xS|I^ z@kL{xo_O0Thc}JEd8IBI(HrzLu{TcTwDTRD8;F+Tu=9G6Avx zHK$W8(i_V;=zoS>dzfHA&=_DLzW2=kNXF#PCC=$i#JUcVfeh^UOzd54x;=Xwe?3#a_O>`d|;Ii7Oy7@KdYlr>0F*%KqAUd}L* z9?xoS+7MMP#tsg^?@Gg!apm_X2G?ucJJ#`WGe*P6AbRV4ksv=Y{Wg>VE-?d48HG&& ztA(T{3K#5QYC#OH2duZ|^%!^*i2F83zDHxsgUHjxcszpMnz5P%;R^*(mOXDPm1<+{ zF6#x>#x`u8Cm#Hk?0#6gMzX<9#}m-Os$=bKb>2SWdi$KoYo^%?H9qq?>|=vq*DGM) z6&1FH?0vqt(3dFt*t#d*cfkc) zP$c07s=_dol|=#p$qfT6w=>yaQ1yJ1%;zOgw_=zNGK)TUc)*guy9=zV9Sn(+KWj*A z+5n##5*lmINvI7Q3blBuS1>9;)CD)3EU@etz$a8_Ykcw#{jzokvo~IpJHU5p$2n6$(Vpw zeBtjF6QQ~6DMD7eoS4*S9T;GMV1?B**Ek`3>&!lqeHaKnWmH%aj4s#xz4IClC}AIM z@&7EYAVe%qaGHQqdKc5epIeDvgvIF2t zdC5k?1K2Zxs)Ku5&oK9^KKAgBlm{GgCU!Y-Z6&)ONLZw4fly^eycp$Tvrm~SbZHcuAh_y6N_!eS>1^Y_dlALNXxmlO4J)H z-Ni7f9BtyL#J1{O^DG08wvFo!SqA9OAP$U#uvKiS8*eAV zjkPCgMRC9167*FWeXe;1(gqke26oFCm{mZXHEv$X?(Oz^5T9onAg*8&Cb~u@ttUC} zfv4X6k=opdH~AuC@bl{0+a0D&?dB!%(pE-loH0Ue+46uxq?2>x1`mv5J%pR<_$?*B zm5}O2i2+{85KlxzegWy%#em9KsS1cq#nOwhLX}|%%NVcM$E`_?5snZN`T@>y5z}Dl zkfQz!p(M8BPCk!DC=!`q7;1;Rj+d4OT}CgwX3S;9@_;20_u~mHs5;Q{a*)5*>5KKR z+1@F~xZ9XMwE;eN=&*EP1j#hQS;9XWMpjAzr{*LR4##+aHA7H?e?SI`67@M}Vw&ts zC5#Z&pb;XROd8j06Xi*>(r#x_<{>O9+#_UJZP+O<(O6o^IhZiO;rf~};&G#y!Q9ajpY9w?hr_2r6;u?IvaLef0hs{tBor|RR+T>a}*up+=tFR@8Fn&n#gn}KR-=` z2~Asbh}96VxcI)y(GOM##xjh*eP|4oE7H`zYmpiCV zHQRfx#(K`7%2QYlR|I9B!a2=^i+S=?PRU)Uv|PdQ1+rMPgmNE96?4H!XC)~n)=5Sv z!5h9wq{rwj?}EpbNLN+ATdMyb)VNj2xBCDrW_i>}!{a%ENNEtHN0|l9145@6pv8)D z*(qc1s!8@3C37bn=BTLhvT#CS&T!dyj^|>_2KZ=?`-TiI_Wvv)oE%X7PA4)AWvwBD zuC73eTvF#8cffO+cvPv-nz6OEe7hsOt=t@6#~gsOFrWgxV%0MMvagCLJ4ZX<`e%t! zQ^ISFs66G&>H{u-n6=1VsZ9zoJ zs0iURHvO$mx4^wi1Bj{&v2!eQVz~y`b_^0p)_nqsk$>zEAuLF`GFG&d-Ftpho^U*K zVz)BS!!&uuD5&niITLDJEgb^K0O-)Y-Xbg8f@76KJvAaH~|M27qU(4I~V(0ft{R!0vr8eiPYlFjg4rYh1C)p~*+UBihC_*5oXa<%GlG zOWFJPfisRS*e83RO_Vw{1sG@>XzUQF{t$?cIU>Yrjob|*>sVSJleU;)<_s^1V;x`_ ziv7L77Ie^0vcRH&6|BYLDDM8yCLHmyCA1l%R`hKhICMbt35j4l#J`MVtE^scwxr~`kUB&y8Q`oe}GMOh_o1eiGo>9>e6VtOi}%wAOY8dLAr zNlM0WE5XxsrMbrg=18Fu!EiQ1W2>OX$3p3*q3yjxLaeGYOvHmj>V8iWRbbm7Ko!Ya zJ2zf|6Bl50zj0z)Uw2cv;gJl!zfb9a)+%ahUMa0GzJEi#Z>vzgM!c_OfglQymLR#| zXoeUX`fG7h*9;I0LO`v^@o~v}+Wg44&(2qBmPQDC2yuQxI@>cGbvpe=QTn>;U;u0P z$R~!!l=b422~NN=#4R*LaP&8EGC|I>z=#`fD{|F_Tpz*jsXF$C!3iF#Nv|h}m(}!M zr?!OwC2>PBc>UD`0;A|TLTZCbVZft=l>LzC0Nt4e*iy#dHMal=U1osYm@yfvy>F}% zdQi+V`f1K^0uZM`4Yt~=u;L~2Vk`ZmK;?w&efSvP|29LJ#Z*^;f_%U*6niH4HCd#A z+Ed!9_OHbF4>s0UxJDaL${DYffbt0G|Rs zAZdM5U|$m3D0$Dg$xDif=`UP5l|f9vUBC%pZY+pCm{>dX z@l0cAT0G#Sy6H6|=dLEKY7wV#;_9=?7?+5Vyl@oR{qOqFW3?jm8}Us`_S-Po$I2kT zG}2Lg4*4SgvtT*%ydId(w(`KLnJF%8*Q;i6hQAO}6vLwe@`E+~(F}pbVs`(@Ou0Ss z-8LVcCij%8t%N08Dt)o9%t9r2kyLpaxrdbNdr8N(jJrvD6Wp~D!|8bYCRb4e=BDpRBw zON7HfJ;@I<$2sdP=B^N!k+hDVGQ_&``&m-XuFBrWSe`7`>Hi*g|0hZSFw2#^nIRrJ pgJ=2tOZYsKxX)6D002ovPDHLkV1mt@>>dCB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/draconicevolution/textures/particle/reactorBeam.png.mcmeta b/src/main/resources/assets/draconicevolution/textures/particle/reactorBeam.png.mcmeta new file mode 100644 index 00000000..b920dcd2 --- /dev/null +++ b/src/main/resources/assets/draconicevolution/textures/particle/reactorBeam.png.mcmeta @@ -0,0 +1 @@ +{ "texture": { "blur": true }} \ No newline at end of file diff --git a/src/main/resources/assets/draconicevolution/textures/particle/reactorEnergyBeam.png b/src/main/resources/assets/draconicevolution/textures/particle/reactorEnergyBeam.png new file mode 100644 index 0000000000000000000000000000000000000000..e08c4afd7c2fa66aafe61c3035b01a1e5c2ccca5 GIT binary patch literal 396 zcmV;70dxL|P)16}|C010qNS#tmY4#EHc4#EKyC`y0;000McNliru-v<{68!KDO)D8du0U1d| zK~z}7#aA&B!!QVQ8LR()t#dx1J!_iSM#8=eQ!i~n2n6KwJC1MrH(oxY^^KG7n)9FN z1kD1^o>L6YJAe$i^SlRY$W~NnE6_g#JOcp1!K`#pd`ElP;)aMS@=2B)l(5UF!vKum zQEk|m1fk&!254S^hAFM80*1augUHc74Ihsl3p4xO{qj(O;{c0*SeXMb7M8_;+sV%6 zqY5C?GtH*77~m}^6F?{oqb{?tKzUU)bk;En!7N2ZF%ZQv^v17skYrgQ2`EoOZmzR@ zvW3}z>ahy7T(OuHlXaUW5DVSj-jLyTps|<%1~(