diff options
Diffstat (limited to 'src/main/java')
65 files changed, 1461 insertions, 1697 deletions
diff --git a/src/main/java/client/ClientProxy.java b/src/main/java/client/ClientProxy.java index 9eb07c62a4..1423e34963 100644 --- a/src/main/java/client/ClientProxy.java +++ b/src/main/java/client/ClientProxy.java @@ -3,10 +3,12 @@ package client; import client.renderer.TESR_BeamTransmitter; import client.renderer.TESR_SECapacitor; import client.renderer.TESR_SETether; + import common.CommonProxy; import common.tileentities.TE_BeamTransmitter; import common.tileentities.TE_SpaceElevatorCapacitor; import common.tileentities.TE_SpaceElevatorTether; + import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; diff --git a/src/main/java/client/gui/Gui_ItemProxyEndpoint.java b/src/main/java/client/gui/Gui_ItemProxyEndpoint.java index 4f80e5d7e3..2a673f16db 100644 --- a/src/main/java/client/gui/Gui_ItemProxyEndpoint.java +++ b/src/main/java/client/gui/Gui_ItemProxyEndpoint.java @@ -1,7 +1,7 @@ package client.gui; -import common.container.Container_ItemProxyEndpoint; import kekztech.KekzCore; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; @@ -10,12 +10,16 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; +import common.container.Container_ItemProxyEndpoint; + public class Gui_ItemProxyEndpoint extends GuiContainer { - private final ResourceLocation texture = - new ResourceLocation(KekzCore.MODID, "textures/gui/ItemTechReceiverNode.png"); + private final ResourceLocation texture = new ResourceLocation( + KekzCore.MODID, + "textures/gui/ItemTechReceiverNode.png"); private final InventoryPlayer inventory; private final IInventory te; diff --git a/src/main/java/client/gui/Gui_ItemProxySource.java b/src/main/java/client/gui/Gui_ItemProxySource.java index a4a4a5c38f..1c1b0171e6 100644 --- a/src/main/java/client/gui/Gui_ItemProxySource.java +++ b/src/main/java/client/gui/Gui_ItemProxySource.java @@ -1,7 +1,7 @@ package client.gui; -import common.container.Container_ItemProxySource; import kekztech.KekzCore; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; @@ -10,8 +10,11 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; +import common.container.Container_ItemProxySource; + public class Gui_ItemProxySource extends GuiContainer { private final ResourceLocation texture = new ResourceLocation(KekzCore.MODID, "textures/gui/ItemTech4by4.png"); diff --git a/src/main/java/client/renderer/ConduitRenderer.java b/src/main/java/client/renderer/ConduitRenderer.java index 1a653e8896..a9e3436bcc 100644 --- a/src/main/java/client/renderer/ConduitRenderer.java +++ b/src/main/java/client/renderer/ConduitRenderer.java @@ -1,14 +1,16 @@ package client.renderer; -import common.tileentities.TE_ItemProxyCable; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; +import common.tileentities.TE_ItemProxyCable; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class ConduitRenderer implements ISimpleBlockRenderingHandler { public static final int RID = RenderingRegistry.getNextAvailableRenderId(); @@ -24,8 +26,8 @@ public class ConduitRenderer implements ISimpleBlockRenderingHandler { public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {} @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { final TileEntity te = world.getTileEntity(x, y, z); if (te instanceof TE_ItemProxyCable) { final TE_ItemProxyCable cable = (TE_ItemProxyCable) te; @@ -69,7 +71,12 @@ public class ConduitRenderer implements ISimpleBlockRenderingHandler { } block.setBlockBounds( - xOffset, yOffset, zOffset, xOffset + xThickness, yOffset + yThickness, zOffset + zThickness); + xOffset, + yOffset, + zOffset, + xOffset + xThickness, + yOffset + yThickness, + zOffset + zThickness); renderer.setRenderBoundsFromBlock(block); } diff --git a/src/main/java/client/renderer/TESR_BeamTransmitter.java b/src/main/java/client/renderer/TESR_BeamTransmitter.java index 38e588dd43..0028c53476 100644 --- a/src/main/java/client/renderer/TESR_BeamTransmitter.java +++ b/src/main/java/client/renderer/TESR_BeamTransmitter.java @@ -1,19 +1,23 @@ package client.renderer; -import common.tileentities.TE_BeamTransmitter; import kekztech.KekzCore; + import net.minecraft.client.renderer.OpenGlHelper; 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; +import common.tileentities.TE_BeamTransmitter; + public class TESR_BeamTransmitter extends TileEntitySpecialRenderer { - private static final ResourceLocation beamTexture = - new ResourceLocation(KekzCore.MODID, "textures/effects/Tether_beam.png"); + private static final ResourceLocation beamTexture = new ResourceLocation( + KekzCore.MODID, + "textures/effects/Tether_beam.png"); @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { @@ -43,8 +47,8 @@ public class TESR_BeamTransmitter extends TileEntitySpecialRenderer { final double height = beamTransmitter.getDistanceFromTarget(); final double uv_x1 = 0.0D; final double uv_x2 = 1.0D; - final double uv_y1 = -1.0D - - streamTextureOffset; // This makes the beam stream upwards if you subtract a time sensitive number + final double uv_y1 = -1.0D - streamTextureOffset; // This makes the beam stream upwards if you subtract a time + // sensitive number // from it final double uv_y2 = height * (0.5D / (halfBeamWidth * 2)) + uv_y1; // Construct mesh with texture diff --git a/src/main/java/client/renderer/TESR_SECapacitor.java b/src/main/java/client/renderer/TESR_SECapacitor.java index 17f10ece83..c4aed65e3d 100644 --- a/src/main/java/client/renderer/TESR_SECapacitor.java +++ b/src/main/java/client/renderer/TESR_SECapacitor.java @@ -1,16 +1,19 @@ package client.renderer; -import common.tileentities.TE_SpaceElevatorCapacitor; import kekztech.KekzCore; + import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import common.tileentities.TE_SpaceElevatorCapacitor; + public class TESR_SECapacitor extends TileEntitySpecialRenderer { - private static final ResourceLocation capSide = - new ResourceLocation(KekzCore.MODID, "textures/blocks/SpaceElevatorCapacitor_side_renderbase.png"); + private static final ResourceLocation capSide = new ResourceLocation( + KekzCore.MODID, + "textures/blocks/SpaceElevatorCapacitor_side_renderbase.png"); @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { diff --git a/src/main/java/client/renderer/TESR_SETether.java b/src/main/java/client/renderer/TESR_SETether.java index a59954ce3e..18672b21c9 100644 --- a/src/main/java/client/renderer/TESR_SETether.java +++ b/src/main/java/client/renderer/TESR_SETether.java @@ -1,17 +1,20 @@ package client.renderer; import kekztech.KekzCore; + import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; public class TESR_SETether extends TileEntitySpecialRenderer { - private static final ResourceLocation tetherBeamTexture = - new ResourceLocation(KekzCore.MODID, "textures/effects/Tether_beam.png"); + private static final ResourceLocation tetherBeamTexture = new ResourceLocation( + KekzCore.MODID, + "textures/effects/Tether_beam.png"); @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java index 3bc8ddc9f9..16485925c2 100644 --- a/src/main/java/common/Blocks.java +++ b/src/main/java/common/Blocks.java @@ -1,9 +1,11 @@ package common; -import common.blocks.*; import kekztech.KekzCore; + import net.minecraft.block.Block; +import common.blocks.*; + public class Blocks { public static Block yszUnit; @@ -59,17 +61,13 @@ public class Blocks { tfftStorageField = Block_TFFTStorageField.registerBlock(); } - /*private static void registerBlocks_Nuclear() { - reactorChamberOFF = Block_ReactorChamber_OFF.registerBlock(); - reactorChamberON = Block_ReactorChamber_ON.registerBlock(); - reactorControlRod = Block_ControlRod.registerBlock(); - } - - private static void registerBlocks_ItemProxy() { - itemProxyCable = Block_ItemProxyCable.registerBlock(); - itemProxySource = Block_ItemProxySource.registerBlock(); - itemProxyEndpoint = Block_ItemProxyEndpoint.registerBlock(); - }*/ + /* + * private static void registerBlocks_Nuclear() { reactorChamberOFF = Block_ReactorChamber_OFF.registerBlock(); + * reactorChamberON = Block_ReactorChamber_ON.registerBlock(); reactorControlRod = Block_ControlRod.registerBlock(); + * } private static void registerBlocks_ItemProxy() { itemProxyCable = Block_ItemProxyCable.registerBlock(); + * itemProxySource = Block_ItemProxySource.registerBlock(); itemProxyEndpoint = + * Block_ItemProxyEndpoint.registerBlock(); } + */ private static void registerBlocks_Jars() { jarThaumiumReinforced = Block_ThaumiumReinforcedJar.registerBlock(); @@ -81,11 +79,11 @@ public class Blocks { // beamTransmitter = Block_BeamTransmitter.registerBlock(); } - /*private static void registerBlocks_SpaceElevator() { - spaceElevatorStructure = Block_SpaceElevator.registerBlock(); - spaceElevatorCapacitor = Block_SpaceElevatorCapacitor.registerBlock(); - spaceElevatorTether = Block_SpaceElevatorTether.registerBlock(); - }*/ + /* + * private static void registerBlocks_SpaceElevator() { spaceElevatorStructure = + * Block_SpaceElevator.registerBlock(); spaceElevatorCapacitor = Block_SpaceElevatorCapacitor.registerBlock(); + * spaceElevatorTether = Block_SpaceElevatorTether.registerBlock(); } + */ private static void registerBlocks_Cosmetics() { largeHexPlate = Block_LargeHexPlate.registerBlock(); diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java index 464f8eab49..f04e7052c5 100644 --- a/src/main/java/common/CommonProxy.java +++ b/src/main/java/common/CommonProxy.java @@ -1,17 +1,19 @@ package common; +import kekztech.GuiHandler; +import kekztech.Items; +import kekztech.KekzCore; + import common.items.ErrorItem; import common.items.MetaItem_CraftingComponent; import common.items.MetaItem_ReactorComponent; import common.tileentities.GTMTE_TFFTHatch; + import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import gregtech.api.GregTech_API; -import kekztech.GuiHandler; -import kekztech.Items; -import kekztech.KekzCore; public class CommonProxy { diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java index 12225b8580..f275d1d37a 100644 --- a/src/main/java/common/Recipes.java +++ b/src/main/java/common/Recipes.java @@ -1,23 +1,15 @@ package common; -import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.LuVTierEnhancer; -import com.github.bartimaeusnek.bartworks.util.BW_Util; -import com.github.technus.tectech.recipe.TT_recipeAdder; -import common.items.ErrorItem; -import common.items.MetaItem_CraftingComponent; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.*; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; import java.util.HashMap; + import kekztech.Items; import kekztech.KekzCore; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; + import thaumcraft.api.ItemApi; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; @@ -25,6 +17,19 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.InfusionRecipe; import util.Util; +import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.LuVTierEnhancer; +import com.github.bartimaeusnek.bartworks.util.BW_Util; +import com.github.technus.tectech.recipe.TT_recipeAdder; +import common.items.ErrorItem; +import common.items.MetaItem_CraftingComponent; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.*; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; + public class Recipes { public static final HashMap<String, InfusionRecipe> infusionRecipes = new HashMap<>(); @@ -56,32 +61,20 @@ public class Recipes { private static void registerRecipes_TFFT() { // TFFT Controller - GT_ModHandler.addCraftingRecipe(TileEntities.tfft.getStackForm(1), new Object[] { - "ESE", - "FTF", - "CVC", - 'E', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.EnderEye, 1), - 'S', - ItemList.Cover_Screen.get(1), - 'F', - ItemList.Field_Generator_LV.get(1), - 'T', - new ItemStack(Blocks.tfftStorageField, 1), - 'C', - "circuitData", - 'V', - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 1), - }); + GT_ModHandler.addCraftingRecipe( + TileEntities.tfft.getStackForm(1), + new Object[] { "ESE", "FTF", "CVC", 'E', + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.EnderEye, 1), 'S', + ItemList.Cover_Screen.get(1), 'F', ItemList.Field_Generator_LV.get(1), 'T', + new ItemStack(Blocks.tfftStorageField, 1), 'C', "circuitData", 'V', + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 1), }); // TFFT Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 3), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 3), - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 3), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 3), }, Materials.Polytetrafluoroethylene.getMolten(144), new ItemStack(Blocks.tfftStorageField, 1), 100, @@ -89,12 +82,9 @@ public class Recipes { // TFFT Multi Hatch GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_HV.get(1), - ItemList.Cover_FluidStorageMonitor.get(1), - ItemList.Field_Generator_LV.get(4), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 25) - }, + new ItemStack[] { ItemList.Hull_HV.get(1), ItemList.Cover_FluidStorageMonitor.get(1), + ItemList.Field_Generator_LV.get(4), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 25) }, Materials.Plastic.getMolten(432), TileEntities.tfftHatch.getStackForm(1), 400, @@ -102,13 +92,11 @@ public class Recipes { // TFFTS |