From 444ea65b143868d434593f00c8da7f4aa9d0bbd7 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 25 Aug 2015 22:06:38 -0400 Subject: [PATCH] Move to 2.9.0 and update to CTMLib's repackaging --- gradle.properties | 2 +- .../java/com/cricketcraft/chisel/api/ICarvable.java | 4 ++-- .../chisel/api/carving/CarvableHelper.java | 2 +- .../chisel/api/carving/IVariationInfo.java | 3 ++- .../chisel/api/carving/VariationInfoBase.java | 2 +- .../chisel/api/rendering/TextureType.java | 11 ++++++----- .../java/team/chisel/client/render/RendererCTM.java | 3 ++- .../team/chisel/client/render/RendererCTMPane.java | 3 +-- .../team/chisel/client/render/RendererEldritch.java | 4 +--- .../chisel/client/render/RendererLayeredGlow.java | 4 +--- .../team/chisel/client/render/RendererMultiLayer.java | 4 +--- .../team/chisel/client/render/RendererRoadLine.java | 4 +--- .../chisel/client/render/RendererSimpleLayered.java | 4 +--- .../team/chisel/client/render/RendererSnakeStone.java | 4 +--- .../team/chisel/client/render/RendererStairs.java | 4 +--- .../chisel/client/render/SubmapManagerAntiblock.java | 8 +++----- .../team/chisel/client/render/SubmapManagerBase.java | 4 +--- .../client/render/SubmapManagerCarpetFloor.java | 6 ++---- .../client/render/SubmapManagerCombinedCTM.java | 5 +++-- .../client/render/SubmapManagerFakeController.java | 7 ++++--- .../team/chisel/client/render/SubmapManagerSlab.java | 8 +++----- .../chisel/client/render/SubmapManagerVoidstone.java | 6 +++--- src/main/java/team/chisel/config/Configurations.java | 3 +-- 23 files changed, 43 insertions(+), 62 deletions(-) diff --git a/gradle.properties b/gradle.properties index 48b5e47c..e00b3cc3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -mod_version=CT2.5.0 +mod_version=2.9.0 minecraft_version=1.7.10 forge_version=10.13.4.1481-1.7.10 diff --git a/src/main/java/com/cricketcraft/chisel/api/ICarvable.java b/src/main/java/com/cricketcraft/chisel/api/ICarvable.java index 2d56407c..2e098431 100644 --- a/src/main/java/com/cricketcraft/chisel/api/ICarvable.java +++ b/src/main/java/com/cricketcraft/chisel/api/ICarvable.java @@ -1,11 +1,11 @@ package com.cricketcraft.chisel.api; +import team.chisel.ctmlib.ICTMBlock; +import team.chisel.ctmlib.ISubmapManager; import net.minecraft.world.IBlockAccess; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.ctmlib.ICTMBlock; -import com.cricketcraft.ctmlib.ISubmapManager; /** * To be implemented on blocks that can be chiseled and need advanced metadata to variation mapping. Currently not very usable without internal classes. diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java index 6decc1e2..405bc78f 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java @@ -3,6 +3,7 @@ package com.cricketcraft.chisel.api.carving; import java.util.ArrayList; import java.util.List; +import team.chisel.ctmlib.ISubmapManager; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -18,7 +19,6 @@ import net.minecraftforge.oredict.OreDictionary; import com.cricketcraft.chisel.api.ChiselAPIProps; import com.cricketcraft.chisel.api.FMPIMC; import com.cricketcraft.chisel.api.rendering.TextureType; -import com.cricketcraft.ctmlib.ISubmapManager; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java b/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java index ce213ef0..a8cf97de 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java @@ -1,7 +1,8 @@ package com.cricketcraft.chisel.api.carving; +import team.chisel.ctmlib.ISubmapManager; + import com.cricketcraft.chisel.api.rendering.TextureType; -import com.cricketcraft.ctmlib.ISubmapManager; public interface IVariationInfo extends ISubmapManager { diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/VariationInfoBase.java b/src/main/java/com/cricketcraft/chisel/api/carving/VariationInfoBase.java index 0ab6621f..73986596 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/VariationInfoBase.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/VariationInfoBase.java @@ -1,5 +1,6 @@ package com.cricketcraft.chisel.api.carving; +import team.chisel.ctmlib.ISubmapManager; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,7 +10,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; import com.cricketcraft.chisel.api.rendering.TextureType; -import com.cricketcraft.ctmlib.ISubmapManager; public class VariationInfoBase implements IVariationInfo { diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java b/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java index 53b14859..197d7615 100644 --- a/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java @@ -15,13 +15,14 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Triple; +import team.chisel.ctmlib.CTM; +import team.chisel.ctmlib.ISubmapManager; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.RenderBlocksColumn; +import team.chisel.ctmlib.TextureSubmap; + import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.ctmlib.CTM; -import com.cricketcraft.ctmlib.ISubmapManager; -import com.cricketcraft.ctmlib.RenderBlocksCTM; -import com.cricketcraft.ctmlib.RenderBlocksColumn; -import com.cricketcraft.ctmlib.TextureSubmap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/team/chisel/client/render/RendererCTM.java b/src/main/java/team/chisel/client/render/RendererCTM.java index 79ce0d66..c3f41744 100644 --- a/src/main/java/team/chisel/client/render/RendererCTM.java +++ b/src/main/java/team/chisel/client/render/RendererCTM.java @@ -1,7 +1,8 @@ package team.chisel.client.render; +import team.chisel.ctmlib.CTMRenderer; + import com.cricketcraft.chisel.api.rendering.ClientUtils; -import com.cricketcraft.ctmlib.CTMRenderer; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/team/chisel/client/render/RendererCTMPane.java b/src/main/java/team/chisel/client/render/RendererCTMPane.java index 31e4be49..86f31e59 100644 --- a/src/main/java/team/chisel/client/render/RendererCTMPane.java +++ b/src/main/java/team/chisel/client/render/RendererCTMPane.java @@ -10,8 +10,7 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.ctmlib.Drawing; - +import team.chisel.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/team/chisel/client/render/RendererEldritch.java b/src/main/java/team/chisel/client/render/RendererEldritch.java index 38be1206..3454a0aa 100644 --- a/src/main/java/team/chisel/client/render/RendererEldritch.java +++ b/src/main/java/team/chisel/client/render/RendererEldritch.java @@ -7,9 +7,7 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; import team.chisel.Chisel; - -import com.cricketcraft.ctmlib.Drawing; - +import team.chisel.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/team/chisel/client/render/RendererLayeredGlow.java b/src/main/java/team/chisel/client/render/RendererLayeredGlow.java index 1da8f717..f5201604 100644 --- a/src/main/java/team/chisel/client/render/RendererLayeredGlow.java +++ b/src/main/java/team/chisel/client/render/RendererLayeredGlow.java @@ -10,10 +10,8 @@ import org.lwjgl.opengl.GL11; import team.chisel.Chisel; import team.chisel.block.BlockCarvableGlow; import team.chisel.config.Configurations; +import team.chisel.ctmlib.Drawing; import team.chisel.utils.GeneralClient; - -import com.cricketcraft.ctmlib.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/team/chisel/client/render/RendererMultiLayer.java b/src/main/java/team/chisel/client/render/RendererMultiLayer.java index acf6bbf7..1b050f61 100644 --- a/src/main/java/team/chisel/client/render/RendererMultiLayer.java +++ b/src/main/java/team/chisel/client/render/RendererMultiLayer.java @@ -1,14 +1,12 @@ package team.chisel.client.render; import team.chisel.block.BlockMultiLayerBase; +import team.chisel.ctmlib.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.MinecraftForgeClient; - -import com.cricketcraft.ctmlib.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; import static org.lwjgl.opengl.GL11.*; diff --git a/src/main/java/team/chisel/client/render/RendererRoadLine.java b/src/main/java/team/chisel/client/render/RendererRoadLine.java index bd14d639..1433ca26 100644 --- a/src/main/java/team/chisel/client/render/RendererRoadLine.java +++ b/src/main/java/team/chisel/client/render/RendererRoadLine.java @@ -2,15 +2,13 @@ package team.chisel.client.render; import team.chisel.Chisel; import team.chisel.block.BlockRoadLine; +import team.chisel.ctmlib.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.ctmlib.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/team/chisel/client/render/RendererSimpleLayered.java b/src/main/java/team/chisel/client/render/RendererSimpleLayered.java index f7524283..06f36731 100644 --- a/src/main/java/team/chisel/client/render/RendererSimpleLayered.java +++ b/src/main/java/team/chisel/client/render/RendererSimpleLayered.java @@ -8,9 +8,7 @@ import org.lwjgl.opengl.GL11; import team.chisel.Chisel; import team.chisel.block.BlockCarvableLayered; - -import com.cricketcraft.ctmlib.Drawing; - +import team.chisel.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/team/chisel/client/render/RendererSnakeStone.java b/src/main/java/team/chisel/client/render/RendererSnakeStone.java index a04c0c5a..08a6585b 100644 --- a/src/main/java/team/chisel/client/render/RendererSnakeStone.java +++ b/src/main/java/team/chisel/client/render/RendererSnakeStone.java @@ -7,9 +7,7 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; import team.chisel.block.BlockSnakestone; - -import com.cricketcraft.ctmlib.Drawing; - +import team.chisel.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/team/chisel/client/render/RendererStairs.java b/src/main/java/team/chisel/client/render/RendererStairs.java index c2c2a9ae..9853beba 100644 --- a/src/main/java/team/chisel/client/render/RendererStairs.java +++ b/src/main/java/team/chisel/client/render/RendererStairs.java @@ -7,9 +7,7 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; import team.chisel.block.BlockCarvableStairs; - -import com.cricketcraft.ctmlib.Drawing; - +import team.chisel.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java index 027383a1..cec1bd11 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java @@ -2,6 +2,9 @@ package team.chisel.client.render; import org.lwjgl.opengl.GL11; +import team.chisel.ctmlib.Drawing; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.TextureSubmap; import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -10,11 +13,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.IItemRenderer; - -import com.cricketcraft.ctmlib.Drawing; -import com.cricketcraft.ctmlib.RenderBlocksCTM; -import com.cricketcraft.ctmlib.TextureSubmap; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/team/chisel/client/render/SubmapManagerBase.java b/src/main/java/team/chisel/client/render/SubmapManagerBase.java index 0d483f58..ac8de3d7 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerBase.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerBase.java @@ -1,13 +1,11 @@ package team.chisel.client.render; +import team.chisel.ctmlib.ISubmapManager; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; - -import com.cricketcraft.ctmlib.ISubmapManager; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java b/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java index 25a248f3..3e3b54c1 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java @@ -1,14 +1,12 @@ package team.chisel.client.render; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.TextureSubmap; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.ctmlib.RenderBlocksCTM; -import com.cricketcraft.ctmlib.TextureSubmap; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java b/src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java index 5d721825..e43d60a0 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java @@ -10,11 +10,12 @@ import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.tuple.Triple; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.TextureSubmap; + import com.cricketcraft.chisel.api.carving.CarvingUtils; import com.cricketcraft.chisel.api.rendering.TextureType; import com.cricketcraft.chisel.api.rendering.TextureType.AbstractSubmapManager; -import com.cricketcraft.ctmlib.RenderBlocksCTM; -import com.cricketcraft.ctmlib.TextureSubmap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java b/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java index 45388ded..f65f1cc8 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java @@ -1,19 +1,20 @@ package team.chisel.client.render; import team.chisel.Chisel; +import team.chisel.ctmlib.CTM; +import team.chisel.ctmlib.TextureSubmap; import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.ctmlib.CTM; -import com.cricketcraft.ctmlib.TextureSubmap; import com.google.common.base.Optional; +import static team.chisel.ctmlib.Dir.*; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import static com.cricketcraft.ctmlib.Dir.*; public class SubmapManagerFakeController extends SubmapManagerBase { diff --git a/src/main/java/team/chisel/client/render/SubmapManagerSlab.java b/src/main/java/team/chisel/client/render/SubmapManagerSlab.java index 3351a9f8..208b0fd0 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerSlab.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerSlab.java @@ -1,16 +1,14 @@ package team.chisel.client.render; +import team.chisel.ctmlib.ISubmapManager; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.TextureSubmap; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; - -import com.cricketcraft.ctmlib.ISubmapManager; -import com.cricketcraft.ctmlib.RenderBlocksCTM; -import com.cricketcraft.ctmlib.TextureSubmap; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java b/src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java index d5484ccb..2c22c430 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java @@ -1,5 +1,8 @@ package team.chisel.client.render; +import team.chisel.ctmlib.ISubmapManager; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.TextureSubmap; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,9 +13,6 @@ import net.minecraftforge.common.util.ForgeDirection; import com.cricketcraft.chisel.api.carving.CarvingUtils; import com.cricketcraft.chisel.api.rendering.TextureType; -import com.cricketcraft.ctmlib.ISubmapManager; -import com.cricketcraft.ctmlib.RenderBlocksCTM; -import com.cricketcraft.ctmlib.TextureSubmap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/team/chisel/config/Configurations.java b/src/main/java/team/chisel/config/Configurations.java index 0d21b44b..e843817e 100644 --- a/src/main/java/team/chisel/config/Configurations.java +++ b/src/main/java/team/chisel/config/Configurations.java @@ -9,8 +9,7 @@ import org.apache.commons.lang3.StringUtils; import team.chisel.Chisel; import team.chisel.Features; - -import com.cricketcraft.ctmlib.CTM; +import team.chisel.ctmlib.CTM; public class Configurations {