From 955911c452500adab7ac25deb0076fcbb2bb42a4 Mon Sep 17 00:00:00 2001 From: CodenameRevy Date: Wed, 25 Sep 2019 12:13:42 +0200 Subject: [PATCH] 1.0.1.1 update: -Fixed launch crash (again, oops...) -Added Custom tabs for Mirrors and other items from this mod --- build.gradle | 2 +- .../codenamerevy/magicmirror/MagicMirror.java | 4 ++ .../magicmirror/init/ItemInit.java | 40 +++++++++++++++---- .../magicmirror/items/ItemBase.java | 12 ++++++ .../magicmirror/tabs/MirrorsItemGroup.java | 17 ++++++++ .../magicmirror/util/Reference.java | 2 +- src/main/resources/META-INF/mods.toml | 2 +- .../assets/magicmirror/lang/en_us.json | 4 +- .../models/item/broken_mirror.json | 7 ++++ .../item/broken_mirror_dimensional.json | 7 ++++ .../models/item/dimension_crystal.json | 7 ++++ .../item/dimension_mirror_cartographer.json | 7 ++++ .../item/dimensional_mirror_desert.json | 7 ++++ .../models/item/dimensional_mirror_end.json | 7 ++++ .../item/dimensional_mirror_jungle.json | 7 ++++ .../item/dimensional_mirror_library.json | 7 ++++ .../item/dimensional_mirror_mansion.json | 7 ++++ .../models/item/dimensional_mirror_ocean.json | 7 ++++ .../models/item/enchanted_mirror.json | 7 ++++ .../item/magic_mirror_cartographer.json | 7 ++++ .../models/item/magic_mirror_desert.json | 7 ++++ .../models/item/magic_mirror_jungle.json | 7 ++++ .../models/item/magic_mirror_library.json | 7 ++++ .../models/item/magic_mirror_mansion.json | 7 ++++ .../models/item/magic_mirror_ocean.json | 7 ++++ 25 files changed, 190 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/codenamerevy/magicmirror/items/ItemBase.java create mode 100644 src/main/java/com/codenamerevy/magicmirror/tabs/MirrorsItemGroup.java create mode 100644 src/main/resources/assets/magicmirror/models/item/broken_mirror.json create mode 100644 src/main/resources/assets/magicmirror/models/item/broken_mirror_dimensional.json create mode 100644 src/main/resources/assets/magicmirror/models/item/dimension_crystal.json create mode 100644 src/main/resources/assets/magicmirror/models/item/dimension_mirror_cartographer.json create mode 100644 src/main/resources/assets/magicmirror/models/item/dimensional_mirror_desert.json create mode 100644 src/main/resources/assets/magicmirror/models/item/dimensional_mirror_end.json create mode 100644 src/main/resources/assets/magicmirror/models/item/dimensional_mirror_jungle.json create mode 100644 src/main/resources/assets/magicmirror/models/item/dimensional_mirror_library.json create mode 100644 src/main/resources/assets/magicmirror/models/item/dimensional_mirror_mansion.json create mode 100644 src/main/resources/assets/magicmirror/models/item/dimensional_mirror_ocean.json create mode 100644 src/main/resources/assets/magicmirror/models/item/enchanted_mirror.json create mode 100644 src/main/resources/assets/magicmirror/models/item/magic_mirror_cartographer.json create mode 100644 src/main/resources/assets/magicmirror/models/item/magic_mirror_desert.json create mode 100644 src/main/resources/assets/magicmirror/models/item/magic_mirror_jungle.json create mode 100644 src/main/resources/assets/magicmirror/models/item/magic_mirror_library.json create mode 100644 src/main/resources/assets/magicmirror/models/item/magic_mirror_mansion.json create mode 100644 src/main/resources/assets/magicmirror/models/item/magic_mirror_ocean.json diff --git a/build.gradle b/build.gradle index b743c19..cf08d34 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '1.0.1.0' +version = '1.0.1.1' group = 'com.codenamerevy.magicmirror' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'magicmirror' diff --git a/src/main/java/com/codenamerevy/magicmirror/MagicMirror.java b/src/main/java/com/codenamerevy/magicmirror/MagicMirror.java index 222e051..60265ba 100644 --- a/src/main/java/com/codenamerevy/magicmirror/MagicMirror.java +++ b/src/main/java/com/codenamerevy/magicmirror/MagicMirror.java @@ -1,6 +1,8 @@ package com.codenamerevy.magicmirror; +import com.codenamerevy.magicmirror.tabs.MirrorsItemGroup; import com.codenamerevy.magicmirror.util.Reference; +import net.minecraft.item.ItemGroup; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; @@ -9,6 +11,8 @@ @Mod(Reference.MODID) public class MagicMirror { + public static final ItemGroup MAGIC_MIRRORS = new MirrorsItemGroup("magic_mirrors"); + public MagicMirror() { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); diff --git a/src/main/java/com/codenamerevy/magicmirror/init/ItemInit.java b/src/main/java/com/codenamerevy/magicmirror/init/ItemInit.java index 5cc6e2a..c2d12d6 100644 --- a/src/main/java/com/codenamerevy/magicmirror/init/ItemInit.java +++ b/src/main/java/com/codenamerevy/magicmirror/init/ItemInit.java @@ -1,10 +1,13 @@ package com.codenamerevy.magicmirror.init; +import com.codenamerevy.magicmirror.MagicMirror; +import com.codenamerevy.magicmirror.items.ItemBase; import com.codenamerevy.magicmirror.items.ItemDimensionalMirror; import com.codenamerevy.magicmirror.items.ItemMagicMirror; import com.codenamerevy.magicmirror.util.Reference; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup;; +import net.minecraft.item.Rarity; import net.minecraft.util.ResourceLocation; import java.util.ArrayList; @@ -14,14 +17,35 @@ public class ItemInit { public static final List ITEMS = new ArrayList(); - public static final Item MAGIC_MIRROR = new ItemMagicMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("magic_mirror")); - public static final Item ICE_MIRROR = new ItemMagicMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("ice_mirror")); - - //TODO: FIX ItemDimensionalMirror class - public static final Item DIMENSIONAL_MIRROR = new ItemDimensionalMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("dimensional_mirror")); - public static final Item DIMENSIONAL_MIRROR_ICE = new ItemDimensionalMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("dimensional_mirror_ice")); - - + //Regular Mirrors + public static final Item MAGIC_MIRROR = new ItemMagicMirror(new Item.Properties().group(MagicMirror.MAGIC_MIRRORS).maxStackSize(1)).setRegistryName(location("magic_mirror")); + public static final Item ICE_MIRROR = new ItemMagicMirror(new Item.Properties().group(MagicMirror.MAGIC_MIRRORS).maxStackSize(1)).setRegistryName(location("ice_mirror")); + /**public static final Item MAGIC_MIRROR_JUNGLE = new ItemMagicMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("magic_mirror_jungle")); + public static final Item MAGIC_MIRROR_DESERT = new ItemMagicMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("magic_mirror_desert.json")); + public static final Item MAGIC_MIRROR_OCEAN = new ItemMagicMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("magic_mirror_ocean.json")); + public static final Item MAGIC_MIRROR_CARTOGRAPHER = new ItemMagicMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("magic_mirror_cartographer")); + public static final Item MAGIC_MIRROR_MANSION = new ItemMagicMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("magic_mirror_mansion")); + public static final Item MAGIC_MIRROR_LIBRARY = new ItemMagicMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("magic_mirror_library")); + **/ + //Dimensional Mirrors + public static final Item DIMENSIONAL_MIRROR = new ItemDimensionalMirror(new Item.Properties().group(MagicMirror.MAGIC_MIRRORS).maxStackSize(1)).setRegistryName(location("dimensional_mirror")); + public static final Item DIMENSIONAL_MIRROR_ICE = new ItemDimensionalMirror(new Item.Properties().group(MagicMirror.MAGIC_MIRRORS).maxStackSize(1)).setRegistryName(location("dimensional_mirror_ice")); + /**public static final Item DIMENSIONAL_MIRROR_JUNGLE = new ItemDimensionalMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("dimensional_mirror_jungle")); + public static final Item DIMENSIONAL_MIRROR_DESERT = new ItemDimensionalMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("dimensional_mirror_desert")); + public static final Item DIMENSIONAL_MIRROR_END = new ItemDimensionalMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("dimensional_mirror_end.json")); + public static final Item DIMENSIONAL_MIRROR_OCEAN = new ItemDimensionalMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("dimensional_mirror_ocean")); + public static final Item DIMENSIONAL_MIRROR_CARTOGRAPHER = new ItemDimensionalMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("dimensional_mirror_cartographer")); + public static final Item DIMENSIONAL_MIRROR_MANSION = new ItemDimensionalMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("dimensional_mirror_mansion")); + public static final Item DIMENSIONAL_MIRROR_LIBRARY = new ItemDimensionalMirror(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1)).setRegistryName(location("dimensional_mirror_library")); + **/ + //Materials + /**public static final Item DIMENSION_CRYSTAL = new ItemBase(new Item.Properties().group(ItemGroup.MATERIALS)).setRegistryName(location("dimension_crystal")); + //TODO: Add Config files + public static final Item MIRROR_FRAME = new ItemBase(new Item.Properties()).setRegistryName(location("mirror_frame")); + public static final Item ENCHANTED_MIRROR = new ItemBase(new Item.Properties().rarity(Rarity.RARE)).setRegistryName(location("enchanted_mirror")); + public static final Item BROKEN_MIRROR = new ItemBase(new Item.Properties()).setRegistryName(location("broken_mirror")); + public static final Item BROKEN_MIRROR_DIMENSIONAL = new ItemBase(new Item.Properties()).setRegistryName(location("broken_mirror_dimensional")); + **/ private static ResourceLocation location(String name) { return new ResourceLocation(Reference.MODID, name); diff --git a/src/main/java/com/codenamerevy/magicmirror/items/ItemBase.java b/src/main/java/com/codenamerevy/magicmirror/items/ItemBase.java new file mode 100644 index 0000000..82b5d94 --- /dev/null +++ b/src/main/java/com/codenamerevy/magicmirror/items/ItemBase.java @@ -0,0 +1,12 @@ +package com.codenamerevy.magicmirror.items; + +import net.minecraft.item.Item; + +public class ItemBase extends Item +{ + + public ItemBase(Properties properties) + { + super(properties); + } +} diff --git a/src/main/java/com/codenamerevy/magicmirror/tabs/MirrorsItemGroup.java b/src/main/java/com/codenamerevy/magicmirror/tabs/MirrorsItemGroup.java new file mode 100644 index 0000000..20c5d22 --- /dev/null +++ b/src/main/java/com/codenamerevy/magicmirror/tabs/MirrorsItemGroup.java @@ -0,0 +1,17 @@ +package com.codenamerevy.magicmirror.tabs; + +import com.codenamerevy.magicmirror.init.ItemInit; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; + +public class MirrorsItemGroup extends ItemGroup +{ + public MirrorsItemGroup(String label) { + super(label); + } + + @Override + public ItemStack createIcon() { + return new ItemStack(ItemInit.MAGIC_MIRROR); + } +} diff --git a/src/main/java/com/codenamerevy/magicmirror/util/Reference.java b/src/main/java/com/codenamerevy/magicmirror/util/Reference.java index 62f8fa8..36a4526 100644 --- a/src/main/java/com/codenamerevy/magicmirror/util/Reference.java +++ b/src/main/java/com/codenamerevy/magicmirror/util/Reference.java @@ -7,7 +7,7 @@ public class Reference { public static final String MODID = "magicmirror"; public static final String NAME = "Magic Mirror"; - public static final String VERSION = "1.0.1.0"; + public static final String VERSION = "1.0.1.1"; public static final String MC_VERSION = "1.14.4"; public static final String CLIENT_PROXY = "com.codenamerevy.magicmirror.proxy.ClientProxy"; public static final String COMMON_PROXY = "com.codenamerevy.magicmirror.proxy.CommonProxy"; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index a0b56bb..686c3ec 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -4,7 +4,7 @@ issueTrackerURL="https://github.com/CodenameRevy/-1.14.4-MagicMirror/issues" [[mods]] modId="magicmirror" -version="1.0.1.30 +version="1.0.1.1" displayName="Magic Mirrors" displayURL="https://github.com/CodenameRevy/-1.14.4-MagicMirror" logoFile="logo.png" diff --git a/src/main/resources/assets/magicmirror/lang/en_us.json b/src/main/resources/assets/magicmirror/lang/en_us.json index a3c4efb..af2f8b4 100644 --- a/src/main/resources/assets/magicmirror/lang/en_us.json +++ b/src/main/resources/assets/magicmirror/lang/en_us.json @@ -12,5 +12,7 @@ "chat.magicmirror.teleport": "Teleporting to your bed...", "subtitle.magicmirror.teleport": "Teleport", - "subtitle.magicmirror.mirror_discharge": "Mirror Discharge" + "subtitle.magicmirror.mirror_discharge": "Mirror Discharge", + + "itemGroup.magic_mirrors": "Magic Mirrors" } \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/broken_mirror.json b/src/main/resources/assets/magicmirror/models/item/broken_mirror.json new file mode 100644 index 0000000..87c279a --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/broken_mirror.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/broken_mirror" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/broken_mirror_dimensional.json b/src/main/resources/assets/magicmirror/models/item/broken_mirror_dimensional.json new file mode 100644 index 0000000..8d2bcd9 --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/broken_mirror_dimensional.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/broken_mirror_dimensional" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/dimension_crystal.json b/src/main/resources/assets/magicmirror/models/item/dimension_crystal.json new file mode 100644 index 0000000..985a00f --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/dimension_crystal.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/dimension_crystal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/dimension_mirror_cartographer.json b/src/main/resources/assets/magicmirror/models/item/dimension_mirror_cartographer.json new file mode 100644 index 0000000..36b8b50 --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/dimension_mirror_cartographer.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/dimensional_mirror_cartographer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_desert.json b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_desert.json new file mode 100644 index 0000000..8e9d9a4 --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_desert.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/dimensional_mirror_desert" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_end.json b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_end.json new file mode 100644 index 0000000..36a009e --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_end.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/dimensional_mirror_end" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_jungle.json b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_jungle.json new file mode 100644 index 0000000..febd3ac --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_jungle.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/dimensional_mirror_jungle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_library.json b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_library.json new file mode 100644 index 0000000..a0e3283 --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_library.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/dimensional_mirror_library" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_mansion.json b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_mansion.json new file mode 100644 index 0000000..400fa06 --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_mansion.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/dimensional_mirror_mansion" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_ocean.json b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_ocean.json new file mode 100644 index 0000000..762358c --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_ocean.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/dimensional_mirror_ocean" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/enchanted_mirror.json b/src/main/resources/assets/magicmirror/models/item/enchanted_mirror.json new file mode 100644 index 0000000..be66eeb --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/enchanted_mirror.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/enchanted_mirror" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/magic_mirror_cartographer.json b/src/main/resources/assets/magicmirror/models/item/magic_mirror_cartographer.json new file mode 100644 index 0000000..4156d10 --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/magic_mirror_cartographer.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/magic_mirror_cartographer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/magic_mirror_desert.json b/src/main/resources/assets/magicmirror/models/item/magic_mirror_desert.json new file mode 100644 index 0000000..bbdf9a6 --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/magic_mirror_desert.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/magic_mirror_desert" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/magic_mirror_jungle.json b/src/main/resources/assets/magicmirror/models/item/magic_mirror_jungle.json new file mode 100644 index 0000000..fda8f61 --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/magic_mirror_jungle.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/magic_mirror_jungle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/magic_mirror_library.json b/src/main/resources/assets/magicmirror/models/item/magic_mirror_library.json new file mode 100644 index 0000000..a320f6c --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/magic_mirror_library.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/magic_mirror_library" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/magic_mirror_mansion.json b/src/main/resources/assets/magicmirror/models/item/magic_mirror_mansion.json new file mode 100644 index 0000000..94dc469 --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/magic_mirror_mansion.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/magic_mirror_mansion" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/magic_mirror_ocean.json b/src/main/resources/assets/magicmirror/models/item/magic_mirror_ocean.json new file mode 100644 index 0000000..568b07b --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/magic_mirror_ocean.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/magic_mirror_ocean" + } +} \ No newline at end of file