From 8b01c06a4d10a333c35ba739ae0a50fe1f578cd5 Mon Sep 17 00:00:00 2001 From: CodenameRevy Date: Tue, 24 Sep 2019 15:42:26 +0200 Subject: [PATCH] 1.0.1.0 Update - Dimensional Mirrors! --- build.gradle | 4 +- .../magicmirror/init/ItemInit.java | 8 ++ .../items/ItemDimensionalMirror.java | 100 ++++++++++++++++++ .../magicmirror/items/ItemMagicMirror.java | 7 +- .../magicmirror/util/ModRarity.java | 27 +++++ .../magicmirror/util/Reference.java | 2 +- .../magicmirror/util/handler/LootHandler.java | 39 +++++-- .../util/handler/RegistryHandler.java | 11 -- src/main/resources/META-INF/mods.toml | 4 +- .../assets/magicmirror/lang/en_us.json | 8 ++ .../models/item/dimensional_mirror.json | 7 ++ .../models/item/dimensional_mirror_ice.json | 7 ++ .../magicmirror/models/item/ice_mirror.json | 7 ++ .../textures/items/dimensional_mirror.png | Bin 0 -> 420 bytes .../textures/items/dimensional_mirror_ice.png | Bin 0 -> 525 bytes .../magicmirror/textures/items/ice_mirror.png | Bin 0 -> 534 bytes .../inject/abandoned_mineshaft.json | 18 ++++ .../loot_tables/inject/buried_treasure.json | 18 ++++ .../loot_tables/inject/desert_pyramid.json | 4 +- .../loot_tables/inject/end_city_treasure.json | 18 ++++ .../loot_tables/inject/igloo_chest.json | 23 ++++ .../loot_tables/inject/jungle_temple.json | 18 ++++ .../loot_tables/inject/nether_bridge.json | 18 ++++ .../inject/shipwreck_treasure.json | 18 ++++ .../loot_tables/inject/simple_dungeon.json | 18 ++++ .../inject/stronghold_corridor.json | 18 ++++ .../inject/stronghold_crossing.json | 18 ++++ .../inject/stronghold_library.json | 18 ++++ .../inject/underwater_ruin_big.json | 18 ++++ .../inject/village_cartographer.json | 18 ++++ .../inject/village_snowy_house.json | 23 ++++ .../loot_tables/inject/woodland_mansion.json | 18 ++++ 32 files changed, 487 insertions(+), 28 deletions(-) create mode 100644 src/main/java/com/codenamerevy/magicmirror/items/ItemDimensionalMirror.java create mode 100644 src/main/java/com/codenamerevy/magicmirror/util/ModRarity.java create mode 100644 src/main/resources/assets/magicmirror/models/item/dimensional_mirror.json create mode 100644 src/main/resources/assets/magicmirror/models/item/dimensional_mirror_ice.json create mode 100644 src/main/resources/assets/magicmirror/models/item/ice_mirror.json create mode 100644 src/main/resources/assets/magicmirror/textures/items/dimensional_mirror.png create mode 100644 src/main/resources/assets/magicmirror/textures/items/dimensional_mirror_ice.png create mode 100644 src/main/resources/assets/magicmirror/textures/items/ice_mirror.png create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/abandoned_mineshaft.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/buried_treasure.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/end_city_treasure.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/igloo_chest.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/jungle_temple.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/nether_bridge.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/shipwreck_treasure.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/simple_dungeon.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/stronghold_corridor.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/stronghold_crossing.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/stronghold_library.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/underwater_ruin_big.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/village_cartographer.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/village_snowy_house.json create mode 100644 src/main/resources/data/magicmirror/loot_tables/inject/woodland_mansion.json diff --git a/build.gradle b/build.gradle index 50b08cb..b743c19 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.0.3' +version = '1.0.1.0' group = 'com.codenamerevy.magicmirror' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'magicmirror' @@ -115,7 +115,7 @@ dependencies { jar { manifest { attributes([ - "Specification-Title": "MagicMirror", + "Specification-Title": "MagicMirrors", "Specification-Vendor": "CodenameRevy", "Specification-Version": "1", // We are version 1 of ourselves "Implementation-Title": project.name, diff --git a/src/main/java/com/codenamerevy/magicmirror/init/ItemInit.java b/src/main/java/com/codenamerevy/magicmirror/init/ItemInit.java index 21aed78..5cc6e2a 100644 --- a/src/main/java/com/codenamerevy/magicmirror/init/ItemInit.java +++ b/src/main/java/com/codenamerevy/magicmirror/init/ItemInit.java @@ -1,5 +1,6 @@ package com.codenamerevy.magicmirror.init; +import com.codenamerevy.magicmirror.items.ItemDimensionalMirror; import com.codenamerevy.magicmirror.items.ItemMagicMirror; import com.codenamerevy.magicmirror.util.Reference; import net.minecraft.item.Item; @@ -14,6 +15,13 @@ 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")); + + private static ResourceLocation location(String name) { return new ResourceLocation(Reference.MODID, name); diff --git a/src/main/java/com/codenamerevy/magicmirror/items/ItemDimensionalMirror.java b/src/main/java/com/codenamerevy/magicmirror/items/ItemDimensionalMirror.java new file mode 100644 index 0000000..c0a54d2 --- /dev/null +++ b/src/main/java/com/codenamerevy/magicmirror/items/ItemDimensionalMirror.java @@ -0,0 +1,100 @@ +package com.codenamerevy.magicmirror.items; + +import com.codenamerevy.magicmirror.init.ItemInit; +import com.codenamerevy.magicmirror.init.SoundInit; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Rarity; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; +import net.minecraft.world.dimension.DimensionType; + +/** + * EXPERIMENTAL!!! + */ +public class ItemDimensionalMirror extends ItemMagicMirror +{ + private PlayerEntity player; + private BlockPos bedPos; + private BlockPos currentPos; + + public ItemDimensionalMirror(Properties properties) + { + super(properties); + + ItemInit.ITEMS.add(this); + } + + @Override + public ItemStack onItemUseFinish(ItemStack stack, World world, LivingEntity entity) + { + if(!world.isRemote()) + { + player = (ServerPlayerEntity) entity; + currentPos = player.getPosition(); + + if(world.getDimension().getType() == DimensionType.THE_NETHER) + { + player.sendStatusMessage(new TranslationTextComponent("chat.magicmirror.dimension"), true); + this.travelHomeFromNether(player); + } + + if(world.getDimension().getType() == DimensionType.THE_END) + { + player.sendStatusMessage(new TranslationTextComponent("chat.magicmirror.dimension"), true); + this.travelHomeFromEnd(player); + } + + bedPos = player.getBedLocation(player.dimension); + + if (bedPos == null) + { + world.playSound(null, currentPos.getX(), currentPos.getY(), currentPos.getZ(), SoundInit.MIRROR_DISCHARGE, SoundCategory.PLAYERS, 1f, 1f); + player.sendStatusMessage(new TranslationTextComponent("chat.magicmirror.bednotfound"), true); + return stack; + } + + if (entity.getRidingEntity() != null) + { + entity.stopRiding(); + } + player.sendStatusMessage(new TranslationTextComponent("chat.magicmirror.teleport"), true); + entity.setPositionAndUpdate(bedPos.getX() + 0.5f, bedPos.getY() + 0.6f, bedPos.getZ() + 0.5f); + entity.fallDistance = 0; + + world.playSound(null, bedPos.getX(), bedPos.getY(), bedPos.getZ(), SoundInit.TELEPORT, SoundCategory.PLAYERS, 1f, 1f); + } + return stack; + } + + private void travelHomeFromNether(PlayerEntity player) + { + ServerPlayerEntity serverPlayer = (ServerPlayerEntity) player; + + DimensionType prevDimension = player.dimension; + DimensionType transDimension = prevDimension == DimensionType.THE_NETHER ? DimensionType.OVERWORLD : DimensionType.THE_NETHER; + + serverPlayer.teleport(player.getServer().getWorld(transDimension), serverPlayer.posX, serverPlayer.posY, serverPlayer.posZ, serverPlayer.rotationYaw, serverPlayer.rotationPitch); + } + + private void travelHomeFromEnd(PlayerEntity player) + { + ServerPlayerEntity serverPlayer = (ServerPlayerEntity) player; + + DimensionType prevDimension = player.dimension; + DimensionType transDimension = prevDimension == DimensionType.THE_END ? DimensionType.OVERWORLD : DimensionType.THE_END; + + serverPlayer.teleport(player.getServer().getWorld(transDimension), serverPlayer.posX, serverPlayer.posY, serverPlayer.posZ, serverPlayer.rotationYaw, serverPlayer.rotationPitch); + } + + @Override + public Rarity getRarity(ItemStack stack) + { + return Rarity.EPIC; + } +} + diff --git a/src/main/java/com/codenamerevy/magicmirror/items/ItemMagicMirror.java b/src/main/java/com/codenamerevy/magicmirror/items/ItemMagicMirror.java index 0a8c695..375fffb 100644 --- a/src/main/java/com/codenamerevy/magicmirror/items/ItemMagicMirror.java +++ b/src/main/java/com/codenamerevy/magicmirror/items/ItemMagicMirror.java @@ -2,6 +2,7 @@ import com.codenamerevy.magicmirror.init.ItemInit; import com.codenamerevy.magicmirror.init.SoundInit; +import com.codenamerevy.magicmirror.util.ModRarity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.*; @@ -10,6 +11,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; +import net.minecraft.world.dimension.DimensionType; import java.util.Random; @@ -57,22 +59,22 @@ public ItemStack onItemUseFinish(ItemStack stack, World world, LivingEntity enti if(!world.dimension.isSurfaceWorld()) { - player.sendStatusMessage(new TranslationTextComponent("chat.magicmirror.power"), true); world.playSound(null, currentPos.getX(), currentPos.getY(), currentPos.getZ(), SoundInit.MIRROR_DISCHARGE, SoundCategory.PLAYERS, 1f, 1f); + player.sendStatusMessage(new TranslationTextComponent("chat.magicmirror.power"), true); return stack; } if (bedPos == null) { - player.sendStatusMessage(new TranslationTextComponent("chat.magicmirror.bednotfound"), true); world.playSound(null, currentPos.getX(), currentPos.getY(), currentPos.getZ(), SoundInit.MIRROR_DISCHARGE, SoundCategory.PLAYERS, 1f, 1f); + player.sendStatusMessage(new TranslationTextComponent("chat.magicmirror.bednotfound"), true); return stack; } @@ -107,7 +109,6 @@ public int getUseDuration(ItemStack stack) return duration; } - @Override public Rarity getRarity(ItemStack stack) { return Rarity.RARE; diff --git a/src/main/java/com/codenamerevy/magicmirror/util/ModRarity.java b/src/main/java/com/codenamerevy/magicmirror/util/ModRarity.java new file mode 100644 index 0000000..2c0658e --- /dev/null +++ b/src/main/java/com/codenamerevy/magicmirror/util/ModRarity.java @@ -0,0 +1,27 @@ +package com.codenamerevy.magicmirror.util; + +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.common.IExtensibleEnum; + +//TODO: Make usage of this :P +public enum ModRarity implements IExtensibleEnum +{ + TRASH(TextFormatting.GRAY), + LEGENDARY(TextFormatting.GREEN), + ULTIMATE(TextFormatting.LIGHT_PURPLE), + DEMONIC(TextFormatting.DARK_RED), + GODLY(TextFormatting.GOLD); + + + public final TextFormatting color; + + ModRarity(TextFormatting formatting) + { + this.color = formatting; + } + + public static ModRarity create(String name, TextFormatting formatting) + { + throw new IllegalStateException("Enum not Extended!"); + } +} diff --git a/src/main/java/com/codenamerevy/magicmirror/util/Reference.java b/src/main/java/com/codenamerevy/magicmirror/util/Reference.java index 7e70218..62f8fa8 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.0.3"; + public static final String VERSION = "1.0.1.0"; 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/java/com/codenamerevy/magicmirror/util/handler/LootHandler.java b/src/main/java/com/codenamerevy/magicmirror/util/handler/LootHandler.java index 9cd070f..710eb50 100644 --- a/src/main/java/com/codenamerevy/magicmirror/util/handler/LootHandler.java +++ b/src/main/java/com/codenamerevy/magicmirror/util/handler/LootHandler.java @@ -23,13 +23,38 @@ public static void lootLoad(LootTableLoadEvent evt) String file = name.substring(name.indexOf(prefix) + prefix.length()); switch(file) { - case "abandoned_mineshaft": //TODO: Add Loot Table - case "desert_pyramid": evt.getTable().addPool(getInjectPool(file)); break; - case "jungle_temple": //TODO: Add Loot Table - case "simple_dungeon": //TODO: Add Loot Table - case "spawn_bonus_chest": //TODO: Add Loot Table - case "stronghold_corridor": //TODO: Add Loot Table - case "village_blacksmith": //TODO: ADD + case "abandoned_mineshaft": + case "buried_treasure": + case "desert_pyramid": + case "end_city_treasure": + case "igloo_chest": + case "jungle_temple": + //case "jungle_temple_dispenser": + case "nether_bridge": + //case "pillager_outpost": + //case "shipwreck_map": + //case "shipwreck_supply": + case "shipwreck_treasure": + case "simple_dungeon": + //case "spawn_bonus_chest": + case "stronghold_corridor": + case "stronghold_crossing": + case "stronghold_library": + case "underwater_ruin_big": + //case "underwater_ruin_small": + //case "village_armorer": + //case "village_weaponsmith": + //case "village_butcher": + case "village_cartographer": + //case "village_mason": + //case "village_shepherd": + //case "village_tannery": + //case "village_desert_house": + //case "village_plains_house": + //case "village_savanna_house": + case "village_snowy_house": + //case "village_taiga_house": + case "woodland_mansion": evt.getTable().addPool(getInjectPool(file)); Reference.LOGGER.info(file + "Loot Table Loaded!"); break; default: break; } } diff --git a/src/main/java/com/codenamerevy/magicmirror/util/handler/RegistryHandler.java b/src/main/java/com/codenamerevy/magicmirror/util/handler/RegistryHandler.java index a75ab71..764b74d 100644 --- a/src/main/java/com/codenamerevy/magicmirror/util/handler/RegistryHandler.java +++ b/src/main/java/com/codenamerevy/magicmirror/util/handler/RegistryHandler.java @@ -19,15 +19,4 @@ public static void onItemRegistry(final RegistryEvent.Register itemRegiste } Reference.LOGGER.info("Registered item(s)!"); } - - /**@SubscribeEvent - public void onRegisterSounds(RegistryEvent.Register event) - { - for(SoundEvent sound : SoundInit.SOUNDS) - { - event.getRegistry().register(sound); - } - Reference.LOGGER.info("Registered sound(s)!"); - } - **/ } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 119b351..a0b56bb 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -4,8 +4,8 @@ issueTrackerURL="https://github.com/CodenameRevy/-1.14.4-MagicMirror/issues" [[mods]] modId="magicmirror" -version="1.0.0.3" -displayName="Magic Mirror" +version="1.0.1.30 +displayName="Magic Mirrors" displayURL="https://github.com/CodenameRevy/-1.14.4-MagicMirror" logoFile="logo.png" #credits="" #optional diff --git a/src/main/resources/assets/magicmirror/lang/en_us.json b/src/main/resources/assets/magicmirror/lang/en_us.json index f08e54b..a3c4efb 100644 --- a/src/main/resources/assets/magicmirror/lang/en_us.json +++ b/src/main/resources/assets/magicmirror/lang/en_us.json @@ -1,8 +1,16 @@ { "item.magicmirror.magic_mirror": "Magic Mirror", + "item.magicmirror.ice_mirror": "Mirror of the Yeti", + + "item.magicmirror.dimensional_mirror": "Dimensional Mirror", + "item.magicmirror.dimensional_mirror_ice": "Mirror of the Yeti (Dimensional)", + "chat.magicmirror.bednotfound": "Bed not found! Make sure you sleep in the bed before you can use the mirror!", "chat.magicmirror.power": "This mirror is not powerful enough for cross-dimension travel!", "chat.magicmirror.nether": "This mirror is not powerful enough to travel trough Nether!", + "chat.magicmirror.dimension": "Jumping to Overworld...", + "chat.magicmirror.teleport": "Teleporting to your bed...", + "subtitle.magicmirror.teleport": "Teleport", "subtitle.magicmirror.mirror_discharge": "Mirror Discharge" } \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/dimensional_mirror.json b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror.json new file mode 100644 index 0000000..380a734 --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/dimensional_mirror" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_ice.json b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_ice.json new file mode 100644 index 0000000..ef9f748 --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/dimensional_mirror_ice.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/dimensional_mirror_ice" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/models/item/ice_mirror.json b/src/main/resources/assets/magicmirror/models/item/ice_mirror.json new file mode 100644 index 0000000..83273a6 --- /dev/null +++ b/src/main/resources/assets/magicmirror/models/item/ice_mirror.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": + { + "layer0": "magicmirror:items/ice_mirror" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magicmirror/textures/items/dimensional_mirror.png b/src/main/resources/assets/magicmirror/textures/items/dimensional_mirror.png new file mode 100644 index 0000000000000000000000000000000000000000..742fb7bbd997b97399c361e599f700be4beda92a GIT binary patch literal 420 zcmV;V0bBlwP)SYw@SqQtnYWLh0T4x! zMlq|?g^}&51aKAlcxQ=UNlnW}j01#+D;ATvSWM>P%lHtt+^m*|D?UR+_KCU-mYMs; zIaN62gkjUg>86Txd3kh@>@V>v(eXC`8&8|;8+#?9?XC2z^AA`iOrsitzo=NNAWKq* z6~XMM+Nn-OZ4IiPvTUlfk(Ny%27%AWPQFWpi};dW=+o}N+k4VTYk#3wi){ANELbM= zLZ4wX?{ptOz#%w+Uz!oE*v``k?ymENl|k)JvP=0T0*T!n^*Cn(C4K>&{d@QVRAVFn O0000s1uML;YL; z2u+Y|I@sGc`1(qkvvwPR=;hTk1Bm>ouZFd%DENUoDi#44e@3jYq-pjC032>_G5(AU z;Z>u-L;YN2y^0d~Q(pmiu1i`<(*$s{W~1K0o`eQF+};8pxTph=(ys$F`vY#)Y^NhKxo;9!0v}Q`5Zb2sSnapk}NAH5vwdMS?~kpxi0@LuUsPIxJv5RoBaWyHTA5e zFH#X&Hr=~>#?drXxrjYUveW{=+t(LPJ{L>-uPp4zEJOe~tW`y$*E5p-QjxUM3Iaym zj*!dbEg}K<_?}@Y{kMUsjk_=w7{Jc$wZV2bH_STYxGJSTMAoY)uUv{ko=jvsnMfE#Z=Q{dD>?c(l-%xD5fLn{oUts@^I;B_9;@I7;<+yWJ6@$s z)^Wwsx1ZefP3EVUmxV4aH;Z&{e-Os6r7rZC6!~WafbsJ)j=eh5_M$FIy=xqMbt*8Z z*Hrub+*n%VA|2&42pDxc>fM^>i9G$8VoUnp2HwQbr53;U4E8Da(Y$9JSC;f*UO5fqy^GzniPwF-y2faaV078 Y7Y1J4F*9J4Z2$lO07*qoM6N<$f-Yw0cmMzZ literal 0 HcmV?d00001 diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/abandoned_mineshaft.json b/src/main/resources/data/magicmirror/loot_tables/inject/abandoned_mineshaft.json new file mode 100644 index 0000000..3c387de --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/abandoned_mineshaft.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 5 + }, + { + "type": "empty", + "weight": 95 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/buried_treasure.json b/src/main/resources/data/magicmirror/loot_tables/inject/buried_treasure.json new file mode 100644 index 0000000..3c387de --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/buried_treasure.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 5 + }, + { + "type": "empty", + "weight": 95 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/desert_pyramid.json b/src/main/resources/data/magicmirror/loot_tables/inject/desert_pyramid.json index 94f3bfb..9155cbb 100644 --- a/src/main/resources/data/magicmirror/loot_tables/inject/desert_pyramid.json +++ b/src/main/resources/data/magicmirror/loot_tables/inject/desert_pyramid.json @@ -7,11 +7,11 @@ { "type": "item", "name": "magicmirror:magic_mirror", - "weight": 20 + "weight": 5 }, { "type": "empty", - "weight": 80 + "weight": 95 } ] }] diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/end_city_treasure.json b/src/main/resources/data/magicmirror/loot_tables/inject/end_city_treasure.json new file mode 100644 index 0000000..000ddc8 --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/end_city_treasure.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:dimensional_mirror", + "weight": 40 + }, + { + "type": "empty", + "weight": 60 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/igloo_chest.json b/src/main/resources/data/magicmirror/loot_tables/inject/igloo_chest.json new file mode 100644 index 0000000..9c2ef23 --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/igloo_chest.json @@ -0,0 +1,23 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 1 + }, + { + "type": "item", + "name": "magicmirror:ice:mirror", + "weight": 4 + }, + { + "type": "empty", + "weight": 95 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/jungle_temple.json b/src/main/resources/data/magicmirror/loot_tables/inject/jungle_temple.json new file mode 100644 index 0000000..3c387de --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/jungle_temple.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 5 + }, + { + "type": "empty", + "weight": 95 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/nether_bridge.json b/src/main/resources/data/magicmirror/loot_tables/inject/nether_bridge.json new file mode 100644 index 0000000..9466991 --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/nether_bridge.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:dimensional_mirror", + "weight": 5 + }, + { + "type": "empty", + "weight": 95 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/shipwreck_treasure.json b/src/main/resources/data/magicmirror/loot_tables/inject/shipwreck_treasure.json new file mode 100644 index 0000000..3c387de --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/shipwreck_treasure.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 5 + }, + { + "type": "empty", + "weight": 95 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/simple_dungeon.json b/src/main/resources/data/magicmirror/loot_tables/inject/simple_dungeon.json new file mode 100644 index 0000000..bc13517 --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/simple_dungeon.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 10 + }, + { + "type": "empty", + "weight": 90 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/stronghold_corridor.json b/src/main/resources/data/magicmirror/loot_tables/inject/stronghold_corridor.json new file mode 100644 index 0000000..bc13517 --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/stronghold_corridor.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 10 + }, + { + "type": "empty", + "weight": 90 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/stronghold_crossing.json b/src/main/resources/data/magicmirror/loot_tables/inject/stronghold_crossing.json new file mode 100644 index 0000000..bc13517 --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/stronghold_crossing.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 10 + }, + { + "type": "empty", + "weight": 90 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/stronghold_library.json b/src/main/resources/data/magicmirror/loot_tables/inject/stronghold_library.json new file mode 100644 index 0000000..bc13517 --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/stronghold_library.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 10 + }, + { + "type": "empty", + "weight": 90 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/underwater_ruin_big.json b/src/main/resources/data/magicmirror/loot_tables/inject/underwater_ruin_big.json new file mode 100644 index 0000000..bc13517 --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/underwater_ruin_big.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 10 + }, + { + "type": "empty", + "weight": 90 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/village_cartographer.json b/src/main/resources/data/magicmirror/loot_tables/inject/village_cartographer.json new file mode 100644 index 0000000..0e9cf5e --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/village_cartographer.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 3 + }, + { + "type": "empty", + "weight": 97 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/village_snowy_house.json b/src/main/resources/data/magicmirror/loot_tables/inject/village_snowy_house.json new file mode 100644 index 0000000..cd54c0f --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/village_snowy_house.json @@ -0,0 +1,23 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 1 + }, + { + "type": "item", + "name": "magicmirror:ice_mirror", + "weight": 1 + }, + { + "type": "empty", + "weight": 95 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/magicmirror/loot_tables/inject/woodland_mansion.json b/src/main/resources/data/magicmirror/loot_tables/inject/woodland_mansion.json new file mode 100644 index 0000000..3c387de --- /dev/null +++ b/src/main/resources/data/magicmirror/loot_tables/inject/woodland_mansion.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries":[ + { + "type": "item", + "name": "magicmirror:magic_mirror", + "weight": 5 + }, + { + "type": "empty", + "weight": 95 + } + ] + }] +} \ No newline at end of file