diff --git a/src/main/java/techreborn/compat/waila/CompatModuleWaila.java b/ToAddBack/compat/waila/CompatModuleWaila.java similarity index 100% rename from src/main/java/techreborn/compat/waila/CompatModuleWaila.java rename to ToAddBack/compat/waila/CompatModuleWaila.java diff --git a/src/main/java/techreborn/compat/waila/WailaProviderMachines.java b/ToAddBack/compat/waila/WailaProviderMachines.java similarity index 100% rename from src/main/java/techreborn/compat/waila/WailaProviderMachines.java rename to ToAddBack/compat/waila/WailaProviderMachines.java diff --git a/src/main/java/techreborn/parts/walia/IPartWaliaProvider.java b/ToAddBack/parts/walia/IPartWaliaProvider.java similarity index 100% rename from src/main/java/techreborn/parts/walia/IPartWaliaProvider.java rename to ToAddBack/parts/walia/IPartWaliaProvider.java diff --git a/src/main/java/techreborn/parts/walia/WailaMcMultiPartCompact.java b/ToAddBack/parts/walia/WailaMcMultiPartCompact.java similarity index 100% rename from src/main/java/techreborn/parts/walia/WailaMcMultiPartCompact.java rename to ToAddBack/parts/walia/WailaMcMultiPartCompact.java diff --git a/src/main/java/techreborn/parts/walia/WaliaPartProvider.java b/ToAddBack/parts/walia/WaliaPartProvider.java similarity index 100% rename from src/main/java/techreborn/parts/walia/WaliaPartProvider.java rename to ToAddBack/parts/walia/WaliaPartProvider.java diff --git a/build.gradle b/build.gradle index e06b79c4d..7780a4b67 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import scala.tools.nsc.io.Jar + buildscript { repositories { mavenCentral() @@ -76,7 +78,7 @@ dependencies { f.mkdir() } compile 'RebornCore:RebornCore-1.9:2.0.0.+:dev' - deobfCompile "mezz.jei:jei_1.9:3.0.+" + deobfCompile "mezz.jei:jei_1.9:3.1.+" deobfCompile 'MCMultiPart:MCMultiPart:1.1.0:universal' } diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 22b324e50..61ea56eb0 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -1,7 +1,5 @@ package techreborn; -import java.io.File; - import net.minecraft.block.BlockDispenser; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.event.ConfigChangedEvent; @@ -16,9 +14,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.registry.EntityRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; - import org.apache.commons.lang3.time.StopWatch; - import reborncore.common.multiblock.MultiblockEventHandler; import reborncore.common.multiblock.MultiblockServerTickHandler; import reborncore.common.packets.AddDiscriminatorEvent; @@ -37,14 +33,7 @@ import techreborn.dispenser.BehaviorDispenseScrapbox; import techreborn.entitys.EntityNukePrimed; import techreborn.events.OreUnifier; import techreborn.events.TRTickHandler; -import techreborn.init.ModBlocks; -import techreborn.init.ModFluids; -import techreborn.init.ModItems; -import techreborn.init.ModLoot; -import techreborn.init.ModParts; -import techreborn.init.ModRecipes; -import techreborn.init.ModSounds; -import techreborn.init.RecipeCompact; +import techreborn.init.*; import techreborn.lib.ModInfo; import techreborn.packets.PacketAesu; import techreborn.packets.PacketIdsu; @@ -53,6 +42,8 @@ import techreborn.tiles.idsu.IDSUManager; import techreborn.utils.StackWIPHandler; import techreborn.world.TechRebornWorldGen; +import java.io.File; + @Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS, acceptedMinecraftVersions = "[1.9]") public class Core { @@ -190,7 +181,7 @@ public class Core @SubscribeEvent public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent cfgChange) { - if (cfgChange.modID.equals("TechReborn")) + if (cfgChange.getModID().equals("TechReborn")) { ConfigTechReborn.Configs(); } diff --git a/src/main/java/techreborn/client/StackToolTipEvent.java b/src/main/java/techreborn/client/StackToolTipEvent.java index c8cb99f34..db5a87f8b 100644 --- a/src/main/java/techreborn/client/StackToolTipEvent.java +++ b/src/main/java/techreborn/client/StackToolTipEvent.java @@ -23,16 +23,16 @@ public class StackToolTipEvent @SubscribeEvent public void handleItemTooltipEvent(ItemTooltipEvent event) { - if (event.itemStack.getItem() instanceof IListInfoProvider) + if (event.getItemStack().getItem() instanceof IListInfoProvider) { - ((IListInfoProvider) event.itemStack.getItem()).addInfo(event.toolTip, false); - } else if (event.itemStack.getItem() instanceof IEnergyInterfaceItem) + ((IListInfoProvider) event.getItemStack().getItem()).addInfo(event.getToolTip(), false); + } else if (event.getItemStack().getItem() instanceof IEnergyInterfaceItem) { if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { int percentage = percentage( - (int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxPower(event.itemStack), - (int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getEnergy(event.itemStack)); + (int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxPower(event.getItemStack()), + (int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getEnergy(event.getItemStack())); ChatFormatting color; if (percentage <= 10) { @@ -44,25 +44,25 @@ public class StackToolTipEvent { color = ChatFormatting.YELLOW; } - event.toolTip.add(color + "" + event.getToolTip().add(color + "" + PowerSystem.getLocaliszedPower( - (int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getEnergy(event.itemStack)) + (int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getEnergy(event.getItemStack())) + ChatFormatting.LIGHT_PURPLE + " stored"); - event.toolTip.add(Color.GREEN + "" + event.getToolTip().add(Color.GREEN + "" + PowerSystem.getLocaliszedPower( - (int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxPower(event.itemStack)) + (int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxPower(event.getItemStack())) + ChatFormatting.LIGHT_PURPLE + " max"); - event.toolTip + event.getToolTip() .add(ChatFormatting.GREEN + "" + percentage + "%" + ChatFormatting.LIGHT_PURPLE + " charged"); - event.toolTip.add(Color.GREEN + "" + PowerSystem.getLocaliszedPower( - (int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxTransfer(event.itemStack)) + event.getToolTip().add(Color.GREEN + "" + PowerSystem.getLocaliszedPower( + (int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxTransfer(event.getItemStack())) + ChatFormatting.LIGHT_PURPLE + " /tick in/out"); } } else { try { - Block block = Block.getBlockFromItem(event.itemStack.getItem()); + Block block = Block.getBlockFromItem(event.getItemStack().getItem()); if (block != null && block instanceof BlockContainer && block.getClass().getCanonicalName().startsWith("techreborn.")) { @@ -70,12 +70,12 @@ public class StackToolTipEvent block.getDefaultState()); if (tile instanceof IListInfoProvider) { - ((IListInfoProvider) tile).addInfo(event.toolTip, false); + ((IListInfoProvider) tile).addInfo(event.getToolTip(), false); } } } catch (NullPointerException e) { - Core.logHelper.debug("Failed to load info for " + event.itemStack.getDisplayName()); + Core.logHelper.debug("Failed to load info for " + event.getItemStack().getDisplayName()); } } } diff --git a/src/main/java/techreborn/client/VersionCheckerClient.java b/src/main/java/techreborn/client/VersionCheckerClient.java index e02a8fcdb..ac945fe16 100644 --- a/src/main/java/techreborn/client/VersionCheckerClient.java +++ b/src/main/java/techreborn/client/VersionCheckerClient.java @@ -1,8 +1,5 @@ package techreborn.client; -import java.awt.*; -import java.util.ArrayList; - import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.fml.client.GuiModList; @@ -10,6 +7,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import reborncore.client.gui.GuiUtil; import techreborn.Core; +import java.awt.*; +import java.util.ArrayList; + public class VersionCheckerClient { ResourceLocation texture; @@ -22,7 +22,7 @@ public class VersionCheckerClient @SubscribeEvent public void drawGui(GuiScreenEvent.DrawScreenEvent event) { - if (event.gui instanceof GuiModList) + if (event.getGui() instanceof GuiModList) { ArrayList changeLog = Core.INSTANCE.versionChecker.getChangeLogSinceCurrentVersion(); String s = ""; @@ -36,16 +36,16 @@ public class VersionCheckerClient { s = "There is an update for TechReborn with " + changeLog.size() + " changes."; } - event.gui.drawString(event.gui.mc.fontRendererObj, s, 10, 5, Color.white.getRGB()); + event.getGui().drawString(event.getGui().mc.fontRendererObj, s, 10, 5, Color.white.getRGB()); if (!Core.INSTANCE.versionChecker.isLatestVersion()) { - if (event.mouseY < 20) + if (event.getMouseY() < 20) { GuiUtil.drawTooltipBox(5, 15, 330, changeLog.size() * 10 + 5); int y = 20; for (String change : changeLog) { - event.gui.drawString(event.gui.mc.fontRendererObj, change, 10, y, Color.white.getRGB()); + event.getGui().drawString(event.getGui().mc.fontRendererObj, change, 10, y, Color.white.getRGB()); y += 10; } } diff --git a/src/main/java/techreborn/client/hud/ChargeHud.java b/src/main/java/techreborn/client/hud/ChargeHud.java index 7f0ad96ca..9147d6303 100644 --- a/src/main/java/techreborn/client/hud/ChargeHud.java +++ b/src/main/java/techreborn/client/hud/ChargeHud.java @@ -38,13 +38,13 @@ public class ChargeHud showHud = !showHud; } - if (event.isCancelable() || event.type != ElementType.ALL) + if (event.isCancelable() || event.getType() != ElementType.ALL) return; if (mc.inGameHasFocus || (mc.currentScreen != null && mc.gameSettings.showDebugInfo)) { if (ConfigTechReborn.ShowChargeHud) - drawChargeHud(event.resolution); + drawChargeHud(event.getResolution()); } } diff --git a/src/main/java/techreborn/client/render/parts/ClientPartModelBakery.java b/src/main/java/techreborn/client/render/parts/ClientPartModelBakery.java index 8cad7917a..e0eca6aed 100644 --- a/src/main/java/techreborn/client/render/parts/ClientPartModelBakery.java +++ b/src/main/java/techreborn/client/render/parts/ClientPartModelBakery.java @@ -33,7 +33,7 @@ public class ClientPartModelBakery { for (EnumCableType type : EnumCableType.values()) { - event.map.registerSprite(new ResourceLocation(type.textureName)); + event.getMap().registerSprite(new ResourceLocation(type.textureName)); } } diff --git a/src/main/java/techreborn/client/render/parts/RenderCablePart.java b/src/main/java/techreborn/client/render/parts/RenderCablePart.java index f2a70f71f..981670fac 100644 --- a/src/main/java/techreborn/client/render/parts/RenderCablePart.java +++ b/src/main/java/techreborn/client/render/parts/RenderCablePart.java @@ -1,29 +1,20 @@ package techreborn.client.render.parts; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.*; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.property.IExtendedBlockState; +import org.lwjgl.util.vector.Vector3f; +import reborncore.common.misc.vecmath.Vecs3dCube; +import techreborn.parts.CableMultipart; +import techreborn.parts.EnumCableType; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.BlockFaceUV; -import net.minecraft.client.renderer.block.model.BlockPartFace; -import net.minecraft.client.renderer.block.model.FaceBakery; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemOverrideList; -import net.minecraft.client.renderer.block.model.ModelRotation; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.property.IExtendedBlockState; - -import org.lwjgl.util.vector.Vector3f; - -import reborncore.common.misc.vecmath.Vecs3dCube; -import techreborn.parts.CableMultipart; -import techreborn.parts.EnumCableType; - public class RenderCablePart implements IBakedModel { @@ -40,6 +31,14 @@ public class RenderCablePart implements IBakedModel public void addCubeToList(Vecs3dCube cube, ArrayList list, BlockPartFace face, ModelRotation modelRotation, TextureAtlasSprite cubeTexture) { + System.out.print(" Max X:" + cube.getMaxX()); + System.out.print(" Min X:" + cube.getMinX()); + + System.out.print(" Max Y:" + cube.getMaxY()); + System.out.print(" Min Y:" + cube.getMinY()); + + System.out.print(" Max Z:" + cube.getMaxZ()); + System.out.print(" Min Z:" + cube.getMinZ()); BlockFaceUV uv = new BlockFaceUV(new float[] { (float) cube.getMinX(), (float) cube.getMinY(), (float) cube.getMaxX(), (float) cube.getMaxY() }, 0); face = new BlockPartFace(null, 0, "", uv); @@ -53,7 +52,7 @@ public class RenderCablePart implements IBakedModel EnumFacing.UP, modelRotation, null, true, true));// up list.add(faceBakery.makeBakedQuad( new Vector3f((float) cube.getMinX(), (float) cube.getMinY(), (float) cube.getMinZ()), - new Vector3f((float) cube.getMaxX(), (float) cube.getMaxY(), (float) cube.getMaxZ()), face, cubeTexture, + new Vector3f((float) cube.getMaxX(), (float) cube.getMaxY(), (float) cube.getMinZ()), face, cubeTexture, EnumFacing.NORTH, modelRotation, null, true, true));// north list.add(faceBakery.makeBakedQuad( new Vector3f((float) cube.getMinX(), (float) cube.getMinY(), (float) cube.getMaxZ()), @@ -98,13 +97,13 @@ public class RenderCablePart implements IBakedModel } if (state.getValue(CableMultipart.NORTH)) { - addCubeToList(new Vecs3dCube(thickness, thickness, 0.0, lastThickness, lastThickness, thickness), list, - face, ModelRotation.X0_Y0, texture); + addCubeToList(new Vecs3dCube(thickness, thickness, lastThickness, lastThickness, lastThickness, 16.0), + list, face, ModelRotation.X0_Y0, texture); } if (state.getValue(CableMultipart.SOUTH)) { - addCubeToList(new Vecs3dCube(thickness, thickness, lastThickness, lastThickness, lastThickness, 16.0), - list, face, ModelRotation.X0_Y0, texture); + addCubeToList(new Vecs3dCube(thickness, thickness, 0.0, lastThickness , lastThickness, thickness), list, + face, ModelRotation.X0_Y0, texture); } if (state.getValue(CableMultipart.EAST)) { diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index d18981646..58ed14fde 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -1,16 +1,14 @@ package techreborn.compat; -import java.util.ArrayList; - import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import techreborn.client.render.parts.ClientPartLoader; -import techreborn.compat.waila.CompatModuleWaila; import techreborn.config.ConfigTechReborn; import techreborn.parts.StandalonePartCompact; import techreborn.parts.TechRebornParts; -import techreborn.parts.walia.WailaMcMultiPartCompact; + +import java.util.ArrayList; public class CompatManager { @@ -38,7 +36,6 @@ public class CompatManager { isGregTechLoaded = true; } - registerCompact(CompatModuleWaila.class, "Waila"); // registerCompact(MinetweakerCompat.class, "MineTweaker3"); // registerCompact(RecipesBiomesOPlenty.class, "BiomesOPlenty"); // registerCompact(RecipesBuildcraft.class, "BuildCraft|Builders"); @@ -46,7 +43,6 @@ public class CompatManager registerCompact(TechRebornParts.class, "mcmultipart"); registerCompact(ClientPartLoader.class, "mcmultipart", "@client"); registerCompact(StandalonePartCompact.class, "!mcmultipart"); - registerCompact(WailaMcMultiPartCompact.class, "mcmultipart", "Waila"); } public void registerCompact(Class moduleClass, Object... objs) diff --git a/src/main/java/techreborn/tiles/idsu/IDSUManager.java b/src/main/java/techreborn/tiles/idsu/IDSUManager.java index 483370b80..3b2b5d2da 100644 --- a/src/main/java/techreborn/tiles/idsu/IDSUManager.java +++ b/src/main/java/techreborn/tiles/idsu/IDSUManager.java @@ -1,23 +1,19 @@ package techreborn.tiles.idsu; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.TreeMap; - +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; import net.minecraft.world.World; import net.minecraft.world.storage.ISaveHandler; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.reflect.TypeToken; +import java.io.*; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.TreeMap; + public class IDSUManager { @@ -29,12 +25,12 @@ public class IDSUManager @SubscribeEvent(priority = EventPriority.HIGHEST) public void worldSave(WorldEvent.Save event) { - if (event.world != null && event.world.getSaveHandler() != null - && event.world.getSaveHandler().getWorldDirectory() != null) + if (event.getWorld() != null && event.getWorld().getSaveHandler() != null + && event.getWorld().getSaveHandler().getWorldDirectory() != null) { - if (worldData.containsKey(event.world)) + if (worldData.containsKey(event.getWorld())) { - worldData.get(event.world).save(); + worldData.get(event.getWorld()).save(); } } } @@ -42,16 +38,16 @@ public class IDSUManager @SubscribeEvent(priority = EventPriority.HIGHEST) public void worldLoad(WorldEvent.Load event) { - if (event.world != null && event.world.getSaveHandler() != null - && event.world.getSaveHandler().getWorldDirectory() != null) + if (event.getWorld() != null && event.getWorld().getSaveHandler() != null + && event.getWorld().getSaveHandler().getWorldDirectory() != null) { - if (worldData.containsKey(event.world)) + if (worldData.containsKey(event.getWorld())) { - worldData.get(event.world).load(); + worldData.get(event.getWorld()).load(); } else { - IDSUWorldSaveData worldSaveData = new IDSUWorldSaveData(event.world); - worldData.put(event.world, worldSaveData); + IDSUWorldSaveData worldSaveData = new IDSUWorldSaveData(event.getWorld()); + worldData.put(event.getWorld(), worldSaveData); worldSaveData.load(); } } @@ -60,12 +56,12 @@ public class IDSUManager @SubscribeEvent(priority = EventPriority.LOWEST) public void worldClosed(WorldEvent.Unload event) { - if (event.world != null && event.world.getSaveHandler() != null - && event.world.getSaveHandler().getWorldDirectory() != null) + if (event.getWorld() != null && event.getWorld().getSaveHandler() != null + && event.getWorld().getSaveHandler().getWorldDirectory() != null) { - if (worldData.containsKey(event.world)) + if (worldData.containsKey(event.getWorld())) { - worldData.get(event.world).save(); + worldData.get(event.getWorld()).save(); } } // this clears the data ready for a new world diff --git a/src/main/java/techreborn/utils/StackWIPHandler.java b/src/main/java/techreborn/utils/StackWIPHandler.java index a909f5a4a..44774719a 100644 --- a/src/main/java/techreborn/utils/StackWIPHandler.java +++ b/src/main/java/techreborn/utils/StackWIPHandler.java @@ -1,13 +1,13 @@ package techreborn.utils; -import java.util.ArrayList; - import net.minecraft.block.Block; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import techreborn.init.ModBlocks; +import java.util.ArrayList; + /** * Created by Mark on 23/03/2016. */ @@ -28,10 +28,10 @@ public class StackWIPHandler @SubscribeEvent public void toolTip(ItemTooltipEvent event) { - Block block = Block.getBlockFromItem(event.itemStack.getItem()); + Block block = Block.getBlockFromItem(event.getItemStack().getItem()); if (block != null && wipBlocks.contains(block)) { - event.toolTip.add(TextFormatting.RED + "WIP Coming Soon"); + event.getToolTip().add(TextFormatting.RED + "WIP Coming Soon"); } } } diff --git a/src/main/java/techreborn/world/TechRebornRetroGen.java b/src/main/java/techreborn/world/TechRebornRetroGen.java index 49f24c701..5ecdca5ff 100644 --- a/src/main/java/techreborn/world/TechRebornRetroGen.java +++ b/src/main/java/techreborn/world/TechRebornRetroGen.java @@ -1,10 +1,7 @@ package techreborn.world; -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.Random; -import java.util.Set; - +import com.google.common.base.Objects; +import com.google.common.collect.Sets; import net.minecraft.world.World; import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -13,8 +10,10 @@ import net.minecraftforge.fml.relauncher.Side; import reborncore.common.misc.ChunkCoord; import techreborn.Core; -import com.google.common.base.Objects; -import com.google.common.collect.Sets; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.Random; +import java.util.Set; /** * Based off https://github.com/SteamNSteel/SteamNSteel @@ -27,7 +26,7 @@ public class TechRebornRetroGen private boolean isChunkEligibleForRetroGen(ChunkDataEvent.Load event) { - return Core.worldGen.config.retroGenOres && event.world.provider.getDimension() == 0 + return Core.worldGen.config.retroGenOres && event.getWorld().provider.getDimension() == 0 && event.getData().getString(RETROGEN_TAG).isEmpty(); }