From 19da4a93980cec2bb5b83556ff23998211408566 Mon Sep 17 00:00:00 2001 From: rikka0w0 <929513338@qq.com> Date: Sat, 16 Feb 2019 20:52:53 +1100 Subject: [PATCH] Upgrade to 1.12.2 --- build.gradle | 6 +- librikka | 2 +- src/java/magicalsculpture/BlockRegistry.java | 2 +- src/java/magicalsculpture/ItemRegistry.java | 2 +- .../magicalsculpture/MagicalSculpture.java | 2 +- src/java/magicalsculpture/Recipes.java | 145 ++++++++++-------- .../block/BlockSculpture.java | 6 +- .../client/FastTESRSculpture.java | 4 +- .../client/SculptureModel.java | 2 +- src/java/magicalsculpture/item/ItemRelic.java | 7 +- .../magicalsculpture/item/ItemReverser.java | 6 +- .../magicalsculpture/recipes/chisel.json | 21 +++ .../magicalsculpture/recipes/reverser.json | 21 +++ 13 files changed, 148 insertions(+), 78 deletions(-) create mode 100644 src/resources/assets/magicalsculpture/recipes/chisel.json create mode 100644 src/resources/assets/magicalsculpture/recipes/reverser.json diff --git a/build.gradle b/build.gradle index ce79314..1882adc 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } @@ -31,9 +31,9 @@ compileJava { } minecraft { - version = "1.11.2-13.20.1.2425" + version = "1.12.2-14.23.5.2768" runDir = "run" - mappings = "stable_32" + mappings = "snapshot_20171003" } sourceSets { diff --git a/librikka b/librikka index 8eb716f..7542a1c 160000 --- a/librikka +++ b/librikka @@ -1 +1 @@ -Subproject commit 8eb716ff609dd39ebdf211a916da565ddc2751b7 +Subproject commit 7542a1c44034d2db4a4d9c7dbd95c408bbe587d4 diff --git a/src/java/magicalsculpture/BlockRegistry.java b/src/java/magicalsculpture/BlockRegistry.java index 1959918..7d362e7 100644 --- a/src/java/magicalsculpture/BlockRegistry.java +++ b/src/java/magicalsculpture/BlockRegistry.java @@ -4,7 +4,7 @@ import magicalsculpture.block.TileEntitySculpture; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.common.registry.IForgeRegistry; +import net.minecraftforge.registries.IForgeRegistry; import rikka.librikka.block.BlockBase; public class BlockRegistry { diff --git a/src/java/magicalsculpture/ItemRegistry.java b/src/java/magicalsculpture/ItemRegistry.java index c9cd534..a17f469 100644 --- a/src/java/magicalsculpture/ItemRegistry.java +++ b/src/java/magicalsculpture/ItemRegistry.java @@ -4,7 +4,7 @@ import magicalsculpture.item.ItemChisel; import magicalsculpture.item.ItemRelic; import magicalsculpture.item.ItemReverser; -import net.minecraftforge.fml.common.registry.IForgeRegistry; +import net.minecraftforge.registries.IForgeRegistry; public class ItemRegistry { public static ItemChisel itemChisel; diff --git a/src/java/magicalsculpture/MagicalSculpture.java b/src/java/magicalsculpture/MagicalSculpture.java index 9e2bd1e..1838c2a 100644 --- a/src/java/magicalsculpture/MagicalSculpture.java +++ b/src/java/magicalsculpture/MagicalSculpture.java @@ -11,7 +11,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.fml.common.registry.IForgeRegistry; +import net.minecraftforge.registries.IForgeRegistry; @Mod(modid = MagicalSculpture.MODID, name = MagicalSculpture.NAME, version = MagicalSculpture.VERSION) public class MagicalSculpture { diff --git a/src/java/magicalsculpture/Recipes.java b/src/java/magicalsculpture/Recipes.java index b7af446..92514f6 100644 --- a/src/java/magicalsculpture/Recipes.java +++ b/src/java/magicalsculpture/Recipes.java @@ -1,5 +1,6 @@ package magicalsculpture; +import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockRedFlower; import net.minecraft.init.Blocks; @@ -7,21 +8,50 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; public class Recipes { + static void addShapedRecipe(ItemStack output, Object... params) { + ResourceLocation name = new ResourceLocation(MagicalSculpture.MODID, + output.getUnlocalizedName().replace("tile.", "").replace(MagicalSculpture.MODID+".", "")); + GameRegistry.addShapedRecipe(name, null, output, params); + } + + static void addShapelessRecipe(ItemStack output, Object... params) { + ResourceLocation name = new ResourceLocation(MagicalSculpture.MODID, + output.getUnlocalizedName().replace("tile.", "").replace(MagicalSculpture.MODID+".", "")); + + Ingredient[] ingredients = new Ingredient[params.length]; + for (int i=0; i< params.length; i++) { + Object param = params[i]; + if (param instanceof ItemStack) { + ingredients[i] = Ingredient.fromStacks((ItemStack)param); + } else if (param instanceof Item) { + ingredients[i] = Ingredient.fromItem((Item)param); + } else if (param instanceof Block) { + ingredients[i] = Ingredient.fromStacks(new ItemStack((Block)param)); + } else { + // WTF?? + throw new RuntimeException("WTF??"); + } + } + + GameRegistry.addShapelessRecipe(name, null, output, ingredients); + } + public static void registerRecipes() { - // Sculpture Chisel - GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemChisel, 1), - "...", - ".O.", - "I..", - 'O', Blocks.OBSIDIAN, - 'I', Items.IRON_INGOT - ); + // Reverser + for (int i=0; i tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World player, List tooltip, ITooltipFlag advanced) { EnumSculptureBlockType blockType = EnumSculptureBlockType.fromInt(stack.getItemDamage()); if (blockType == null) return; diff --git a/src/java/magicalsculpture/client/FastTESRSculpture.java b/src/java/magicalsculpture/client/FastTESRSculpture.java index 2e74b3c..480bb96 100644 --- a/src/java/magicalsculpture/client/FastTESRSculpture.java +++ b/src/java/magicalsculpture/client/FastTESRSculpture.java @@ -1,7 +1,7 @@ package magicalsculpture.client; import magicalsculpture.block.TileEntitySculpture; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.util.math.BlockPos; import net.minecraftforge.client.model.animation.FastTESR; @@ -21,7 +21,7 @@ public boolean isGlobalRenderer(TileEntitySculpture.Render te) { } @Override - public void renderTileEntityFast(TileEntitySculpture.Render te, double x, double y, double z, float partialTicks, int destroyStage, VertexBuffer buffer) { + public void renderTileEntityFast(TileEntitySculpture.Render te, double x, double y, double z, float partialTicks, int destroyStage, float partial, BufferBuilder buffer) { BlockPos pos = te.getPos(); double xoff = x-pos.getX() + 0.5F; double yoff = y-pos.getY() - 0.01F; diff --git a/src/java/magicalsculpture/client/SculptureModel.java b/src/java/magicalsculpture/client/SculptureModel.java index daaaffa..67c1ab5 100644 --- a/src/java/magicalsculpture/client/SculptureModel.java +++ b/src/java/magicalsculpture/client/SculptureModel.java @@ -1,6 +1,6 @@ package magicalsculpture.client; -import com.google.common.base.Function; +import java.util.function.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; diff --git a/src/java/magicalsculpture/item/ItemRelic.java b/src/java/magicalsculpture/item/ItemRelic.java index 32edb4e..5658b8c 100644 --- a/src/java/magicalsculpture/item/ItemRelic.java +++ b/src/java/magicalsculpture/item/ItemRelic.java @@ -1,16 +1,17 @@ package magicalsculpture.item; import magicalsculpture.CreativeTab; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.text.translation.I18n; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import rikka.librikka.item.ISimpleTexture; import rikka.librikka.item.ItemBase; +import javax.annotation.Nullable; import java.util.List; public class ItemRelic extends ItemBase implements ISimpleTexture{ @@ -41,7 +42,7 @@ public String getIconName(int i) { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { tooltip.add(I18n.translateToLocal("item.magicalsculpture:relic." + stack.getItemDamage() + ".comment")); tooltip.add(I18n.translateToLocal("item.magicalsculpture:relic.comment")); } diff --git a/src/java/magicalsculpture/item/ItemReverser.java b/src/java/magicalsculpture/item/ItemReverser.java index 141795d..a2ea98d 100644 --- a/src/java/magicalsculpture/item/ItemReverser.java +++ b/src/java/magicalsculpture/item/ItemReverser.java @@ -1,14 +1,16 @@ package magicalsculpture.item; import magicalsculpture.CreativeTab; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import rikka.librikka.item.ISimpleTexture; import rikka.librikka.item.ItemBase; +import javax.annotation.Nullable; import java.util.List; public class ItemReverser extends ItemBase implements ISimpleTexture { @@ -23,7 +25,7 @@ public String getIconName(int i) { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { tooltip.add(I18n.translateToLocal("item.magicalsculpture:reverser.comment")); } } diff --git a/src/resources/assets/magicalsculpture/recipes/chisel.json b/src/resources/assets/magicalsculpture/recipes/chisel.json new file mode 100644 index 0000000..d3761f5 --- /dev/null +++ b/src/resources/assets/magicalsculpture/recipes/chisel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + + "pattern": [ + " O ", + "I " + ], + + "key": { + "O": { + "item": "minecraft:obsidian" + }, + "I": { + "item": "minecraft:iron_ingot" + } + }, + + "result": { + "item": "magicalsculpture:chisel" + } +} diff --git a/src/resources/assets/magicalsculpture/recipes/reverser.json b/src/resources/assets/magicalsculpture/recipes/reverser.json new file mode 100644 index 0000000..a4b7db5 --- /dev/null +++ b/src/resources/assets/magicalsculpture/recipes/reverser.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shapeless", + + "ingredients": [ + { + "item": "minecraft:glowstone_dust" + }, + { + "item": "magicalsculpture:relic", + "count": 1, + "data": 29 + }, + { + "item": "minecraft:redstone" + } + ], + + "result": { + "item": "magicalsculpture:reverser" + } +}