Updated to more recent dependencies + MCP mapping

davenonymous · thraaawn · commit d7bf12cb2cb5 · 2018-12-26T13:11:55.000+01:00
Also fought a bit with gradle.
diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,7 @@ minecraft {
     version = "${config.minecraft.version}-${config.forge.version}"
     runDir = "run"
 
-    mappings = "snapshot_20170811"
+    mappings = "stable_39"
 }
 
 repositories {
@@ -72,7 +72,7 @@ repositories {
 
 dependencies {
     deobfCompile "mezz.jei:jei_${config.minecraft.version}:${config.jei.version}:api"
-    runtime "mezz.jei:jei_${config.minecraft.version}:${config.jei.version}"
+    //runtime "mezz.jei:jei_${config.minecraft.version}:${config.jei.version}"
 
     deobfCompile "mcp.mobius.waila:Hwyla:${config.waila.version}:api"
 
@@ -91,9 +91,7 @@ dependencies {
         transitive = false
     }
 
-    deobfCompile("cofh:CoFHCore:${config.minecraft.version}-${config.cofh.core.version}:universal") {
-        transitive = false
-    }
+    deobfCompile("cofh:CoFHCore:${config.minecraft.version}-${config.cofh.core.version}:universal")
 
     // And some runtime-dependencies for the above two libraries.
     runtime("cofh:ThermalFoundation:${config.minecraft.version}-${config.cofh.thermalfoundation.version}:universal") {
diff --git a/build.properties b/build.properties
@@ -1,14 +1,14 @@
 minecraft.version=1.12.2
-forge.version=14.23.3.2669
+forge.version=14.23.5.2768
 mod.version=3.0.12
-jei.version=4.9.0.163
+jei.version=4.14.1.235
 waila.version=1.8.20-B35_1.12
-rs.version=1.5.35-16
-oc.version=MC1.12.1-1.7.1.43
-cofh.core.version=4.3.10.4
-cofh.world.version=1.1.1.12
-cofh.thermalcultivation.version=0.1.2.8
-cofh.thermaldynamics.version=2.3.10.4
-cofh.thermalexpansion.version=5.3.10.12
-cofh.thermalfoundation.version=2.3.10.6
-ccl.version=3.1.5.333
+rs.version=1.6.13-362
+oc.version=MC1.12.2-1.7.3.146
+cofh.core.version=4.6.1.22
+cofh.world.version=1.3.0.6
+cofh.thermalcultivation.version=0.3.1.8
+cofh.thermaldynamics.version=2.5.3.16
+cofh.thermalexpansion.version=5.5.2.39
+cofh.thermalfoundation.version=2.6.1.22
+ccl.version=3.2.2.354
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
diff --git a/src/main/java/org/dave/compactmachines3/CompactMachines3.java b/src/main/java/org/dave/compactmachines3/CompactMachines3.java
@@ -13,6 +13,7 @@
 import org.dave.compactmachines3.integration.CapabilityNullHandlerRegistry;
 import org.dave.compactmachines3.miniaturization.MultiblockRecipes;
 import org.dave.compactmachines3.misc.ConfigurationHandler;
+import org.dave.compactmachines3.misc.CreativeTabCompactMachines3;
 import org.dave.compactmachines3.misc.PlayerEventHandler;
 import org.dave.compactmachines3.misc.RenderTickCounter;
 import org.dave.compactmachines3.network.PackageHandler;
@@ -39,6 +40,8 @@ public class CompactMachines3
     @Mod.Instance(CompactMachines3.MODID)
     public static CompactMachines3 instance;
 
+    public static final CreativeTabCompactMachines3 CREATIVE_TAB = new CreativeTabCompactMachines3();
+
     @SidedProxy(clientSide = "org.dave.compactmachines3.proxy.ClientProxy", serverSide = "org.dave.compactmachines3.proxy.ServerProxy")
     public static CommonProxy proxy;
 
diff --git a/src/main/java/org/dave/compactmachines3/block/BlockBase.java b/src/main/java/org/dave/compactmachines3/block/BlockBase.java
@@ -14,10 +14,10 @@ public BlockBase() {
     }
 
     @Override
-    public Block setUnlocalizedName(String name) {
+    public Block setTranslationKey(String name) {
         if(!name.startsWith(CompactMachines3.MODID + ".")) {
             name = CompactMachines3.MODID + "." + name;
         }
-        return super.setUnlocalizedName(name);
+        return super.setTranslationKey(name);
     }
 }
diff --git a/src/main/java/org/dave/compactmachines3/block/BlockFieldProjector.java b/src/main/java/org/dave/compactmachines3/block/BlockFieldProjector.java
@@ -29,10 +29,10 @@
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import org.dave.compactmachines3.CompactMachines3;
 import org.dave.compactmachines3.compat.ITopInfoProvider;
 import org.dave.compactmachines3.miniaturization.MultiblockRecipe;
 import org.dave.compactmachines3.miniaturization.MultiblockRecipes;
-import org.dave.compactmachines3.misc.CreativeTabCompactMachines3;
 import org.dave.compactmachines3.misc.RotationTools;
 import org.dave.compactmachines3.network.MessageParticleBlockMarker;
 import org.dave.compactmachines3.network.PackageHandler;
@@ -51,7 +51,7 @@ public BlockFieldProjector(Material material) {
         this.setHardness(8.0F);
         this.setResistance(20.0F);
 
-        this.setCreativeTab(CreativeTabCompactMachines3.COMPACTMACHINES3_TAB);
+        this.setCreativeTab(CompactMachines3.CREATIVE_TAB);
 
         setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
         setDefaultState(blockState.getBaseState());
@@ -137,7 +137,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En
         if(invalidBlock != null) {
             IBlockState blockState = world.getBlockState(invalidBlock);
             Block block = blockState.getBlock();
-            String blockName = block.getUnlocalizedName();
+            String blockName = block.getTranslationKey();
 
             Item item = Item.getItemFromBlock(block);
             if(item != null) {
@@ -227,7 +227,7 @@ public static EnumFacing getFacingFromEntity(BlockPos clickedBlock, EntityLiving
 
     @Override
     public IBlockState getStateFromMeta(int meta) {
-        return getDefaultState().withProperty(FACING, EnumFacing.getFront(meta & 7));
+        return getDefaultState().withProperty(FACING, EnumFacing.byIndex(meta & 7));
     }
 
     @Override
diff --git a/src/main/java/org/dave/compactmachines3/block/BlockMachine.java b/src/main/java/org/dave/compactmachines3/block/BlockMachine.java
@@ -35,7 +35,6 @@
 import org.dave.compactmachines3.CompactMachines3;
 import org.dave.compactmachines3.compat.ITopInfoProvider;
 import org.dave.compactmachines3.init.Blockss;
-import org.dave.compactmachines3.misc.CreativeTabCompactMachines3;
 import org.dave.compactmachines3.network.MessageMachineContent;
 import org.dave.compactmachines3.network.PackageHandler;
 import org.dave.compactmachines3.reference.EnumMachineSize;
@@ -64,7 +63,7 @@ public BlockMachine(Material material) {
         this.setHardness(8.0F);
         this.setResistance(20.0F);
 
-        this.setCreativeTab(CreativeTabCompactMachines3.COMPACTMACHINES3_TAB);
+        this.setCreativeTab(CompactMachines3.CREATIVE_TAB);
 
         setDefaultState(blockState.getBaseState().withProperty(SIZE, EnumMachineSize.TINY));
     }
diff --git a/src/main/java/org/dave/compactmachines3/block/BlockRedstoneTunnel.java b/src/main/java/org/dave/compactmachines3/block/BlockRedstoneTunnel.java
@@ -154,10 +154,10 @@ public TileEntity createNewTileEntity(World worldIn, int meta) {
     public IBlockState getStateFromMeta(int meta) {
         IBlockState state = getDefaultState();
         if(meta >= 6) {
-            state = state.withProperty(MACHINE_SIDE, EnumFacing.getFront(meta-6));
+            state = state.withProperty(MACHINE_SIDE, EnumFacing.byIndex(meta-6));
             state = state.withProperty(IS_OUTPUT, true);
         } else {
-            state = state.withProperty(MACHINE_SIDE, EnumFacing.getFront(meta));
+            state = state.withProperty(MACHINE_SIDE, EnumFacing.byIndex(meta));
             state = state.withProperty(IS_OUTPUT, false);
         }
 
diff --git a/src/main/java/org/dave/compactmachines3/block/BlockTunnel.java b/src/main/java/org/dave/compactmachines3/block/BlockTunnel.java
@@ -82,7 +82,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En
 
     @Override
     public IBlockState getStateFromMeta(int meta) {
-        return getDefaultState().withProperty(MACHINE_SIDE, EnumFacing.getFront(meta));
+        return getDefaultState().withProperty(MACHINE_SIDE, EnumFacing.byIndex(meta));
     }
 
     @Override
diff --git a/src/main/java/org/dave/compactmachines3/block/BlockWall.java b/src/main/java/org/dave/compactmachines3/block/BlockWall.java
@@ -18,11 +18,11 @@
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import org.dave.compactmachines3.CompactMachines3;
 import org.dave.compactmachines3.init.Blockss;
 import org.dave.compactmachines3.item.ItemRedstoneTunnelTool;
 import org.dave.compactmachines3.item.ItemTunnelTool;
 import org.dave.compactmachines3.misc.ConfigurationHandler;
-import org.dave.compactmachines3.misc.CreativeTabCompactMachines3;
 import org.dave.compactmachines3.misc.CubeTools;
 import org.dave.compactmachines3.utility.ShrinkingDeviceUtils;
 import org.dave.compactmachines3.world.WorldSavedDataMachines;
@@ -38,7 +38,7 @@ public BlockWall(Material material) {
         this.setLightOpacity(1);
         this.setLightLevel(1.0f);
 
-        this.setCreativeTab(CreativeTabCompactMachines3.COMPACTMACHINES3_TAB);
+        this.setCreativeTab(CompactMachines3.CREATIVE_TAB);
     }
 
     @SideOnly(Side.CLIENT)
diff --git a/src/main/java/org/dave/compactmachines3/block/BlockWallBreakable.java b/src/main/java/org/dave/compactmachines3/block/BlockWallBreakable.java
@@ -6,7 +6,7 @@
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import org.dave.compactmachines3.misc.CreativeTabCompactMachines3;
+import org.dave.compactmachines3.CompactMachines3;
 
 public class BlockWallBreakable extends BlockBase {
 
@@ -16,7 +16,7 @@ public BlockWallBreakable(Material material) {
         this.setHardness(3.0f);
         this.setResistance(128.0f);
 
-        this.setCreativeTab(CreativeTabCompactMachines3.COMPACTMACHINES3_TAB);
+        this.setCreativeTab(CompactMachines3.CREATIVE_TAB);
     }
 
     @SideOnly(Side.CLIENT)
diff --git a/src/main/java/org/dave/compactmachines3/command/CommandRecipeCopyShape.java b/src/main/java/org/dave/compactmachines3/command/CommandRecipeCopyShape.java
@@ -47,7 +47,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 
         Vec3d vec3d = player.getPositionEyes(1.0F);
         Vec3d vec3d1 = player.getLook(1.0F);
-        Vec3d vec3d2 = vec3d.addVector(vec3d1.x * 32.0d, vec3d1.y * 32.0d, vec3d1.z * 32.0d);
+        Vec3d vec3d2 = vec3d.add(vec3d1.x * 32.0d, vec3d1.y * 32.0d, vec3d1.z * 32.0d);
 
         RayTraceResult result = player.world.rayTraceBlocks(vec3d, vec3d2);
         if(result.typeOfHit != RayTraceResult.Type.BLOCK) {
diff --git a/src/main/java/org/dave/compactmachines3/command/CommandRecipeGenerateInWorld.java b/src/main/java/org/dave/compactmachines3/command/CommandRecipeGenerateInWorld.java
@@ -50,7 +50,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 
         Vec3d vec3d = player.getPositionEyes(1.0F);
         Vec3d vec3d1 = player.getLook(1.0F);
-        Vec3d vec3d2 = vec3d.addVector(vec3d1.x * 32.0d, vec3d1.y * 32.0d, vec3d1.z * 32.0d);
+        Vec3d vec3d2 = vec3d.add(vec3d1.x * 32.0d, vec3d1.y * 32.0d, vec3d1.z * 32.0d);
 
         RayTraceResult result = player.world.rayTraceBlocks(vec3d, vec3d2);
         if(result.typeOfHit != RayTraceResult.Type.BLOCK) {
diff --git a/src/main/java/org/dave/compactmachines3/gui/machine/GuiMachine.java b/src/main/java/org/dave/compactmachines3/gui/machine/GuiMachine.java
@@ -585,7 +585,7 @@ private static void renderEntity(Entity entity) {
         GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
 
         try {
-            Minecraft.getMinecraft().getRenderManager().doRenderEntity(entity, x, y, z, entity.rotationYaw, 1.0F, false);
+            Minecraft.getMinecraft().getRenderManager().renderEntity(entity, x, y, z, entity.rotationYaw, 1.0F, false);
         } catch (Exception e) {
             Logz.debug("Could not render entity '%s': %s", entity.getClass().getSimpleName(), e.getMessage());
         }
diff --git a/src/main/java/org/dave/compactmachines3/item/ItemBase.java b/src/main/java/org/dave/compactmachines3/item/ItemBase.java
@@ -9,10 +9,10 @@ public ItemBase() {
     }
 
     @Override
-    public Item setUnlocalizedName(String name) {
+    public Item setTranslationKey(String name) {
         if(!name.startsWith(CompactMachines3.MODID + ".")) {
             name = CompactMachines3.MODID + "." + name;
         }
-        return super.setUnlocalizedName(name);
+        return super.setTranslationKey(name);
     }
 }
diff --git a/src/main/java/org/dave/compactmachines3/item/ItemBlockMachine.java b/src/main/java/org/dave/compactmachines3/item/ItemBlockMachine.java
@@ -26,7 +26,7 @@ public class ItemBlockMachine extends ItemBlock {
     public ItemBlockMachine(Block block) {
         super(block);
         if (!(block instanceof IMetaBlockName)) {
-            throw new IllegalArgumentException(String.format("The given block %s is not an instance of IMetaBlockName!", block.getUnlocalizedName()));
+            throw new IllegalArgumentException(String.format("The given block %s is not an instance of IMetaBlockName!", block.getTranslationKey()));
         }
 
         this.setMaxDamage(0);
@@ -38,9 +38,10 @@ public int getMetadata(int damage) {
         return damage;
     }
 
+
     @Override
-    public String getUnlocalizedName(ItemStack stack) {
-        return super.getUnlocalizedName(stack) + "." + ((IMetaBlockName)this.block).getSpecialName(stack);
+    public String getTranslationKey(ItemStack stack) {
+        return super.getTranslationKey(stack) + "." + ((IMetaBlockName)this.block).getSpecialName(stack);
     }
 
     @Override
@@ -57,7 +58,7 @@ public void addInformation(ItemStack stack, @Nullable World worldIn, List<String
         if(GuiScreen.isShiftKeyDown()) {
             int size = Blockss.machine.getStateFromMeta(stack.getItemDamage()).getValue(BlockMachine.SIZE).getDimension() - 1;
             String sizeString = size + "x" + size + "x" + size;
-            tooltip.add(TextFormatting.YELLOW + I18n.format("tooltip.compactmachines3.machine.hint", I18n.format(this.getUnlocalizedName(stack) + ".name"), sizeString));
+            tooltip.add(TextFormatting.YELLOW + I18n.format("tooltip.compactmachines3.machine.hint", I18n.format(this.getTranslationKey(stack) + ".name"), sizeString));
         } else {
             tooltip.add(TextFormatting.GRAY + I18n.format("tooltip." + CompactMachines3.MODID + ".hold_shift.hint"));
         }
diff --git a/src/main/java/org/dave/compactmachines3/item/ItemPersonalShrinkingDevice.java b/src/main/java/org/dave/compactmachines3/item/ItemPersonalShrinkingDevice.java
@@ -19,7 +19,6 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 import org.dave.compactmachines3.CompactMachines3;
 import org.dave.compactmachines3.misc.ConfigurationHandler;
-import org.dave.compactmachines3.misc.CreativeTabCompactMachines3;
 import org.dave.compactmachines3.reference.GuiIds;
 import org.dave.compactmachines3.world.WorldSavedDataMachines;
 import org.dave.compactmachines3.world.tools.StructureTools;
@@ -32,7 +31,7 @@ public class ItemPersonalShrinkingDevice extends ItemBase {
     public ItemPersonalShrinkingDevice() {
         super();
 
-        this.setCreativeTab(CreativeTabCompactMachines3.COMPACTMACHINES3_TAB);
+        this.setCreativeTab(CompactMachines3.CREATIVE_TAB);
         this.setMaxStackSize(1);
     }
 
diff --git a/src/main/java/org/dave/compactmachines3/item/ItemRedstoneTunnelTool.java b/src/main/java/org/dave/compactmachines3/item/ItemRedstoneTunnelTool.java
@@ -11,7 +11,6 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import org.dave.compactmachines3.CompactMachines3;
-import org.dave.compactmachines3.misc.CreativeTabCompactMachines3;
 
 import javax.annotation.Nullable;
 import java.util.List;
@@ -20,7 +19,7 @@ public class ItemRedstoneTunnelTool extends ItemBase {
     public ItemRedstoneTunnelTool() {
         super();
 
-        this.setCreativeTab(CreativeTabCompactMachines3.COMPACTMACHINES3_TAB);
+        this.setCreativeTab(CompactMachines3.CREATIVE_TAB);
     }
 
     @SideOnly(Side.CLIENT)
diff --git a/src/main/java/org/dave/compactmachines3/item/ItemTunnelTool.java b/src/main/java/org/dave/compactmachines3/item/ItemTunnelTool.java
@@ -11,7 +11,6 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import org.dave.compactmachines3.CompactMachines3;
-import org.dave.compactmachines3.misc.CreativeTabCompactMachines3;
 
 import javax.annotation.Nullable;
 import java.util.List;
@@ -20,7 +19,7 @@ public class ItemTunnelTool extends ItemBase {
     public ItemTunnelTool() {
         super();
 
-        this.setCreativeTab(CreativeTabCompactMachines3.COMPACTMACHINES3_TAB);
+        this.setCreativeTab(CompactMachines3.CREATIVE_TAB);
     }
 
     @SideOnly(Side.CLIENT)
diff --git a/src/main/java/org/dave/compactmachines3/misc/CreativeTabCompactMachines3.java b/src/main/java/org/dave/compactmachines3/misc/CreativeTabCompactMachines3.java
@@ -5,11 +5,13 @@
 import org.dave.compactmachines3.CompactMachines3;
 import org.dave.compactmachines3.init.Itemss;
 
-public class CreativeTabCompactMachines3 {
-    public static final CreativeTabs COMPACTMACHINES3_TAB = new CreativeTabs(CompactMachines3.MODID) {
-        @Override
-        public ItemStack getTabIconItem() {
-            return new ItemStack(Itemss.psd);
-        }
-    };
+public class CreativeTabCompactMachines3 extends CreativeTabs {
+    public CreativeTabCompactMachines3() {
+        super(CompactMachines3.MODID);
+    }
+
+    @Override
+    public ItemStack createIcon() {
+        return new ItemStack(Itemss.psd);
+    }
 }
diff --git a/src/main/java/org/dave/compactmachines3/network/MessageMachineContent.java b/src/main/java/org/dave/compactmachines3/network/MessageMachineContent.java
@@ -34,7 +34,7 @@ public MessageMachineContent(int coords) {
         machinePos = data.getMachinePosition(coords);
         machineSize = data.machineSizes.getOrDefault(coords, EnumMachineSize.MAXIMUM).getDimension();
 
-        Chunk chunk = DimensionTools.getServerMachineWorld().getChunkFromBlockCoords(new BlockPos(coords * 1024, 40, 0));
+        Chunk chunk = DimensionTools.getServerMachineWorld().getChunk(new BlockPos(coords * 1024, 40, 0));
         this.data = ChunkUtils.writeChunkToNBT(chunk, DimensionTools.getServerMachineWorld(), new NBTTagCompound());
 
         if(machinePos != null) {
diff --git a/src/main/java/org/dave/compactmachines3/proxy/CommonProxy.java b/src/main/java/org/dave/compactmachines3/proxy/CommonProxy.java
diff --git a/src/main/java/org/dave/compactmachines3/render/TESRCraftingHologram.java b/src/main/java/org/dave/compactmachines3/render/TESRCraftingHologram.java
diff --git a/src/main/java/org/dave/compactmachines3/world/WorldSavedDataMachines.java b/src/main/java/org/dave/compactmachines3/world/WorldSavedDataMachines.java
diff --git a/src/main/java/org/dave/compactmachines3/world/tools/StructureTools.java b/src/main/java/org/dave/compactmachines3/world/tools/StructureTools.java

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@ public BlockBase() {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`@Override`
`17`		`- public Block setUnlocalizedName(String name) {`
	`17`	`+ public Block setTranslationKey(String name) {`
`18`	`18`	`if(!name.startsWith(CompactMachines3.MODID + ".")) {`
`19`	`19`	`name = CompactMachines3.MODID + "." + name;`
`20`	`20`	`}`
`21`		`- return super.setUnlocalizedName(name);`
	`21`	`+ return super.setTranslationKey(name);`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En`
`82`	`82`
`83`	`83`	`@Override`
`84`	`84`	`public IBlockState getStateFromMeta(int meta) {`
`85`		`- return getDefaultState().withProperty(MACHINE_SIDE, EnumFacing.getFront(meta));`
	`85`	`+ return getDefaultState().withProperty(MACHINE_SIDE, EnumFacing.byIndex(meta));`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Override`