From f66a58ccd635b0691dca982ce4d93bd63361d20b Mon Sep 17 00:00:00 2001 From: Shyrik Date: Wed, 21 Feb 2018 14:19:21 +0100 Subject: [PATCH 1/2] updated to 1.12 --- build.gradle | 13 +++++++++---- build.properties | 5 +++-- src/main/java/tv/vanhal/jacb/BlockBench.java | 6 ++---- src/main/java/tv/vanhal/jacb/JACB.java | 18 +++++++----------- src/main/java/tv/vanhal/jacb/TileBench.java | 1 - .../java/tv/vanhal/jacb/compat/JeiHandler.java | 2 -- .../java/tv/vanhal/jacb/core/ClientProxy.java | 3 --- .../tv/vanhal/jacb/gui/BenchContainer.java | 4 +--- src/main/java/tv/vanhal/jacb/gui/BenchGUI.java | 5 ++--- .../tv/vanhal/jacb/gui/SimpleGuiHandler.java | 1 - .../{betterBench.json => betterbench.json} | 2 +- src/main/resources/assets/jacb/lang/de_DE.lang | 2 +- src/main/resources/assets/jacb/lang/en_US.lang | 2 +- src/main/resources/assets/jacb/lang/nl_NL.lang | 2 +- src/main/resources/assets/jacb/lang/zh_CN.lang | 6 +++--- .../{betterBench.json => betterbench.json} | 0 .../block/{topOnly.json => toponly.json} | 0 .../{betterBench.json => betterbench.json} | 0 18 files changed, 31 insertions(+), 41 deletions(-) rename src/main/resources/assets/jacb/blockstates/{betterBench.json => betterbench.json} (77%) rename src/main/resources/assets/jacb/models/block/{betterBench.json => betterbench.json} (100%) rename src/main/resources/assets/jacb/models/block/{topOnly.json => toponly.json} (100%) rename src/main/resources/assets/jacb/models/item/{betterBench.json => betterbench.json} (100%) diff --git a/build.gradle b/build.gradle index 89f72a0..547d555 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { maven { url = "http://files.minecraftforge.net/maven" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } apply plugin: 'net.minecraftforge.gradle.forge' @@ -17,7 +17,7 @@ configFile.withReader { // read config. it shall from now on be referenced as simply config or as project.config def prop = new Properties() prop.load(it) - ext.config = new ConfigSlurper().parse prop + project.ext.config = new ConfigSlurper().parse prop } //y = config.droneAlter as Integer @@ -33,6 +33,11 @@ version = config.mod_version + "." + config.buildNum group= "tv.vanhal.jacb" archivesBaseName = "JACB-" + config.minecraft_version +sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. +compileJava { + sourceCompatibility = targetCompatibility = '1.8' +} + repositories { maven { url "http://dvs1.progwml6.com/files/maven" @@ -44,12 +49,12 @@ minecraft { runDir = "run" replace "@VERSION@", project.version - mappings = "snapshot_20161220" + mappings = config.mappings useDepAts = true } dependencies { - deobfCompile "mezz.jei:jei_"+config.minecraft_version+":4.2.10.248" + deobfCompile "mezz.jei:jei_1.12:4.+" } processResources diff --git a/build.properties b/build.properties index c4514bf..82f3d34 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,6 @@ -minecraft_version=1.11.2 -forge_version=13.20.0.2260 +minecraft_version=1.12.2 +forge_version=14.23.2.2613 +mappings=snapshot_20171003 mod_version=1.0 buildNum=6 droneAlter=0 diff --git a/src/main/java/tv/vanhal/jacb/BlockBench.java b/src/main/java/tv/vanhal/jacb/BlockBench.java index b1b198a..48ef29e 100644 --- a/src/main/java/tv/vanhal/jacb/BlockBench.java +++ b/src/main/java/tv/vanhal/jacb/BlockBench.java @@ -6,7 +6,6 @@ import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -14,7 +13,6 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -37,7 +35,7 @@ protected BlockBench() { } @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileBench(); } @@ -73,7 +71,7 @@ public void dumpItems(World world, BlockPos pos, ItemStack items) { entItem.motionZ = (double)((float)world.rand.nextGaussian() * f3); if (items.hasTagCompound()) { - entItem.getEntityItem().setTagCompound((NBTTagCompound)items.getTagCompound().copy()); + entItem.writeToNBT((NBTTagCompound)items.getTagCompound().copy()); } world.spawnEntity(entItem); diff --git a/src/main/java/tv/vanhal/jacb/JACB.java b/src/main/java/tv/vanhal/jacb/JACB.java index 901e1ac..196053d 100644 --- a/src/main/java/tv/vanhal/jacb/JACB.java +++ b/src/main/java/tv/vanhal/jacb/JACB.java @@ -1,12 +1,12 @@ package tv.vanhal.jacb; +import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; +import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -14,11 +14,8 @@ import org.apache.logging.log4j.Logger; import tv.vanhal.jacb.core.Proxy; -import tv.vanhal.jacb.gui.BenchGUI; import tv.vanhal.jacb.gui.SimpleGuiHandler; import tv.vanhal.jacb.ref.Ref; -import net.minecraftforge.fml.client.event.ConfigChangedEvent; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -27,7 +24,6 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -71,17 +67,17 @@ public void preInit(FMLPreInitializationEvent event) { //Initialise the block bench = new BlockBench(); - GameRegistry.register(bench); - GameRegistry.register(new ItemBlock(bench).setRegistryName(bench.getRegistryName())); + GameRegistry.findRegistry(Block.class).register(bench); + GameRegistry.findRegistry(Item.class).register(new ItemBlock(bench).setRegistryName(bench.getRegistryName())); //set recipes ShapelessOreRecipe recipe; if (config.getBoolean("straightSwap", "General", true, "JACB Crafting tables can be crafted by putting a vanilla crafting bench in a crafting grid, other wise it requires a chest as well")) { - recipe = new ShapelessOreRecipe(new ItemStack(bench), Blocks.CRAFTING_TABLE); + recipe = new ShapelessOreRecipe(null, new ItemStack(bench), Blocks.CRAFTING_TABLE); } else { - recipe = new ShapelessOreRecipe(new ItemStack(bench), Blocks.CRAFTING_TABLE, Blocks.CHEST); + recipe = new ShapelessOreRecipe(null, new ItemStack(bench), Blocks.CRAFTING_TABLE, Blocks.CHEST); } - GameRegistry.addRecipe(recipe); + GameRegistry.findRegistry(IRecipe.class).register(recipe.setRegistryName(bench.getRegistryName())); config.save(); } diff --git a/src/main/java/tv/vanhal/jacb/TileBench.java b/src/main/java/tv/vanhal/jacb/TileBench.java index c864d8c..83cfcab 100644 --- a/src/main/java/tv/vanhal/jacb/TileBench.java +++ b/src/main/java/tv/vanhal/jacb/TileBench.java @@ -5,7 +5,6 @@ import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/tv/vanhal/jacb/compat/JeiHandler.java b/src/main/java/tv/vanhal/jacb/compat/JeiHandler.java index e5d9c67..db7bd1a 100644 --- a/src/main/java/tv/vanhal/jacb/compat/JeiHandler.java +++ b/src/main/java/tv/vanhal/jacb/compat/JeiHandler.java @@ -1,10 +1,8 @@ package tv.vanhal.jacb.compat; -import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; -import mezz.jei.api.IRecipeRegistry; import mezz.jei.api.ISubtypeRegistry; import mezz.jei.api.JEIPlugin; import mezz.jei.api.ingredients.IModIngredientRegistration; diff --git a/src/main/java/tv/vanhal/jacb/core/ClientProxy.java b/src/main/java/tv/vanhal/jacb/core/ClientProxy.java index 3246e0d..84bf183 100644 --- a/src/main/java/tv/vanhal/jacb/core/ClientProxy.java +++ b/src/main/java/tv/vanhal/jacb/core/ClientProxy.java @@ -1,8 +1,5 @@ package tv.vanhal.jacb.core; -import net.minecraftforge.fml.client.registry.ClientRegistry; -import tv.vanhal.jacb.compat.JeiHandler; - public class ClientProxy extends Proxy { @Override diff --git a/src/main/java/tv/vanhal/jacb/gui/BenchContainer.java b/src/main/java/tv/vanhal/jacb/gui/BenchContainer.java index 2a399cf..c16b58f 100644 --- a/src/main/java/tv/vanhal/jacb/gui/BenchContainer.java +++ b/src/main/java/tv/vanhal/jacb/gui/BenchContainer.java @@ -2,7 +2,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ClickType; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCraftResult; @@ -11,7 +10,6 @@ import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; -import tv.vanhal.jacb.JACB; import tv.vanhal.jacb.TileBench; public class BenchContainer extends Container { @@ -39,7 +37,7 @@ public BenchContainer(InventoryPlayer inv, TileBench tile) { public void onCraftMatrixChanged(IInventory inv) { craftResult.setInventorySlotContents(0, - CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, bench.getWorld())); + CraftingManager.findMatchingResult(this.craftMatrix, bench.getWorld())); if (init) updateTile(); } diff --git a/src/main/java/tv/vanhal/jacb/gui/BenchGUI.java b/src/main/java/tv/vanhal/jacb/gui/BenchGUI.java index 63db867..b73a709 100644 --- a/src/main/java/tv/vanhal/jacb/gui/BenchGUI.java +++ b/src/main/java/tv/vanhal/jacb/gui/BenchGUI.java @@ -5,7 +5,6 @@ import tv.vanhal.jacb.TileBench; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; @@ -18,8 +17,8 @@ public BenchGUI(InventoryPlayer inv, TileBench tile) { @Override protected void drawGuiContainerForegroundLayer(int x, int y) { - this.fontRendererObj.drawString(I18n.translateToLocal("container.bettercrafting"), 28, 6, 0x404040); - this.fontRendererObj.drawString(I18n.translateToLocal("container.inventory"), 8, 74, 0x404040); + this.fontRenderer.drawString(I18n.translateToLocal("container.bettercrafting"), 28, 6, 0x404040); + this.fontRenderer.drawString(I18n.translateToLocal("container.inventory"), 8, 74, 0x404040); } @Override diff --git a/src/main/java/tv/vanhal/jacb/gui/SimpleGuiHandler.java b/src/main/java/tv/vanhal/jacb/gui/SimpleGuiHandler.java index 09d6b8f..bbac935 100644 --- a/src/main/java/tv/vanhal/jacb/gui/SimpleGuiHandler.java +++ b/src/main/java/tv/vanhal/jacb/gui/SimpleGuiHandler.java @@ -2,7 +2,6 @@ import tv.vanhal.jacb.TileBench; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; diff --git a/src/main/resources/assets/jacb/blockstates/betterBench.json b/src/main/resources/assets/jacb/blockstates/betterbench.json similarity index 77% rename from src/main/resources/assets/jacb/blockstates/betterBench.json rename to src/main/resources/assets/jacb/blockstates/betterbench.json index 22f0e6b..3c57618 100644 --- a/src/main/resources/assets/jacb/blockstates/betterBench.json +++ b/src/main/resources/assets/jacb/blockstates/betterbench.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "jacb:betterBench" + "model": "jacb:betterbench" }, "variants": { "normal": [{}], diff --git a/src/main/resources/assets/jacb/lang/de_DE.lang b/src/main/resources/assets/jacb/lang/de_DE.lang index 76e3a41..b2c7553 100644 --- a/src/main/resources/assets/jacb/lang/de_DE.lang +++ b/src/main/resources/assets/jacb/lang/de_DE.lang @@ -1,3 +1,3 @@ itemGroup.JACB=JACB container.bettercrafting=Besseres Handwerk -tile.betterBench.name=JACB Werkbank +tile.betterbench.name=JACB Werkbank diff --git a/src/main/resources/assets/jacb/lang/en_US.lang b/src/main/resources/assets/jacb/lang/en_US.lang index c87b8ea..569b22d 100644 --- a/src/main/resources/assets/jacb/lang/en_US.lang +++ b/src/main/resources/assets/jacb/lang/en_US.lang @@ -1,3 +1,3 @@ itemGroup.JACB=JACB container.bettercrafting=Better Crafting -tile.betterBench.name=JACB Crafting Table \ No newline at end of file +tile.betterbench.name=JACB Crafting Table \ No newline at end of file diff --git a/src/main/resources/assets/jacb/lang/nl_NL.lang b/src/main/resources/assets/jacb/lang/nl_NL.lang index 863fd01..0340295 100644 --- a/src/main/resources/assets/jacb/lang/nl_NL.lang +++ b/src/main/resources/assets/jacb/lang/nl_NL.lang @@ -1,3 +1,3 @@ itemGroup.JACB=JACB container.bettercrafting=Verbeterde werkbank -tile.betterBench.name=JACB Werkbank +tile.betterbench.name=JACB Werkbank diff --git a/src/main/resources/assets/jacb/lang/zh_CN.lang b/src/main/resources/assets/jacb/lang/zh_CN.lang index 95b462d..827fa03 100644 --- a/src/main/resources/assets/jacb/lang/zh_CN.lang +++ b/src/main/resources/assets/jacb/lang/zh_CN.lang @@ -1,3 +1,3 @@ -itemGroup.JACB=更好的工作台 -container.bettercrafting=更好的工作台 -tile.betterBench.name=更好的工作台 +itemGroup.JACB=更好的工作å�° +container.bettercrafting=更好的工作å�° +tile.betterbench.name=更好的工作å�° diff --git a/src/main/resources/assets/jacb/models/block/betterBench.json b/src/main/resources/assets/jacb/models/block/betterbench.json similarity index 100% rename from src/main/resources/assets/jacb/models/block/betterBench.json rename to src/main/resources/assets/jacb/models/block/betterbench.json diff --git a/src/main/resources/assets/jacb/models/block/topOnly.json b/src/main/resources/assets/jacb/models/block/toponly.json similarity index 100% rename from src/main/resources/assets/jacb/models/block/topOnly.json rename to src/main/resources/assets/jacb/models/block/toponly.json diff --git a/src/main/resources/assets/jacb/models/item/betterBench.json b/src/main/resources/assets/jacb/models/item/betterbench.json similarity index 100% rename from src/main/resources/assets/jacb/models/item/betterBench.json rename to src/main/resources/assets/jacb/models/item/betterbench.json From 5b4fe7885bd2fbabbdd104d13806c9ee4b4a8592 Mon Sep 17 00:00:00 2001 From: Shyrik Date: Wed, 21 Feb 2018 14:26:21 +0100 Subject: [PATCH 2/2] fixed chinese translation file --- src/main/resources/assets/jacb/lang/zh_CN.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/jacb/lang/zh_CN.lang b/src/main/resources/assets/jacb/lang/zh_CN.lang index 827fa03..1de65ed 100644 --- a/src/main/resources/assets/jacb/lang/zh_CN.lang +++ b/src/main/resources/assets/jacb/lang/zh_CN.lang @@ -1,3 +1,3 @@ -itemGroup.JACB=更好的工作å�° -container.bettercrafting=更好的工作å�° -tile.betterbench.name=更好的工作å�° +itemGroup.JACB=更好的工作台 +container.bettercrafting=更好的工作台 +tile.betterbench.name=更好的工作台