diff --git a/src/main/java/electroblob/wizardry/block/BlockCrystal.java b/src/main/java/electroblob/wizardry/block/BlockCrystal.java index 2d0f4dd9..ff43ff8f 100644 --- a/src/main/java/electroblob/wizardry/block/BlockCrystal.java +++ b/src/main/java/electroblob/wizardry/block/BlockCrystal.java @@ -5,12 +5,7 @@ import electroblob.wizardry.registry.WizardryTabs; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -18,12 +13,10 @@ import java.util.EnumMap; public class BlockCrystal extends Block { - public static final PropertyEnum ELEMENT = PropertyEnum.create("element", Element.class); + private static final EnumMap map_colours = new EnumMap<>(Element.class); - private static final EnumMap map_colours = new EnumMap<>(Element.class); - - static { - map_colours.put(Element.MAGIC, MapColor.PINK); + static { + map_colours.put(Element.MAGIC, MapColor.PINK); map_colours.put(Element.FIRE, MapColor.ORANGE_STAINED_HARDENED_CLAY); map_colours.put(Element.ICE, MapColor.LIGHT_BLUE); map_colours.put(Element.LIGHTNING, MapColor.CYAN); @@ -32,45 +25,19 @@ public class BlockCrystal extends Block { map_colours.put(Element.SORCERY, MapColor.LIME); map_colours.put(Element.HEALING, MapColor.YELLOW); } - - public BlockCrystal(Material material){ - super(material); - this.setDefaultState(this.blockState.getBaseState().withProperty(ELEMENT, Element.MAGIC)); - this.setCreativeTab(WizardryTabs.WIZARDRY); + + private final Element element; + + public BlockCrystal(Element element) { + super(Material.IRON); + this.setCreativeTab(WizardryTabs.WIZARDRY); this.setHarvestLevel("pickaxe", 2); - } - - @Override - public int damageDropped(IBlockState state){ - return (state.getValue(ELEMENT)).ordinal(); - } - - @Override - public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos){ - return map_colours.get(state.getProperties().get(ELEMENT)); + this.element = element; } @Override - public void getSubBlocks(CreativeTabs tab, NonNullList items){ - if(this.getCreativeTab() == tab){ - for(Element element : Element.values()){ - items.add(new ItemStack(this, 1, element.ordinal())); - } - } + public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos) { + return map_colours.get(state.getProperties().get(element)); } - - @Override - public IBlockState getStateFromMeta(int metadata){ - return this.getDefaultState().withProperty(ELEMENT, Element.values()[metadata]); - } - @Override - public int getMetaFromState(IBlockState state){ - return (state.getValue(ELEMENT)).ordinal(); - } - - @Override - protected BlockStateContainer createBlockState(){ - return new BlockStateContainer(this, ELEMENT); - } } diff --git a/src/main/java/electroblob/wizardry/block/BlockCrystalOre.java b/src/main/java/electroblob/wizardry/block/BlockCrystalOre.java index 04ae8b4b..a96c9d1a 100644 --- a/src/main/java/electroblob/wizardry/block/BlockCrystalOre.java +++ b/src/main/java/electroblob/wizardry/block/BlockCrystalOre.java @@ -40,7 +40,7 @@ public class BlockCrystalOre extends Block { @Override public Item getItemDropped(IBlockState state, Random random, int fortune){ - return WizardryItems.crystal_magic; + return WizardryItems.magic_crystal; } @Override diff --git a/src/main/java/electroblob/wizardry/client/model/WizardryModels.java b/src/main/java/electroblob/wizardry/client/model/WizardryModels.java index b62222d3..43f848e5 100644 --- a/src/main/java/electroblob/wizardry/client/model/WizardryModels.java +++ b/src/main/java/electroblob/wizardry/client/model/WizardryModels.java @@ -51,13 +51,6 @@ public final class WizardryModels { public static void register(ModelRegistryEvent event){ // ItemBlocks - - ModelLoader.setCustomStateMapper(WizardryBlocks.crystal_block, new StateMap.Builder() - .withName(BlockCrystal.ELEMENT).withSuffix("_crystal_block").build()); - // Yay unchecked casting! But we know it's always ok here, and it makes everything much neater. - ItemBlockMultiTextured crystalBlockItem = (ItemBlockMultiTextured)Item.getItemFromBlock(WizardryBlocks.crystal_block); - registerMultiTexturedModel(crystalBlockItem); - ModelLoader.setCustomStateMapper(WizardryBlocks.runestone, new StateMap.Builder() .withName(BlockRunestone.ELEMENT).withSuffix("_runestone").build()); ItemBlockMultiTextured runestoneItem = (ItemBlockMultiTextured)Item.getItemFromBlock(WizardryBlocks.runestone); diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java b/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java index 984e53df..baa211f0 100644 --- a/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java +++ b/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java @@ -341,7 +341,7 @@ public class EntityEvilWizard extends EntityMob implements ISpellCaster, IEntity int j = 3 + this.rand.nextInt(3) + this.rand.nextInt(1 + lootingLevel); for(int k = 0; k < j; k++){ - this.dropItem(WizardryItems.crystal_magic, 1); + this.dropItem(WizardryItems.magic_crystal, 1); } // Evil wizards occasionally drop one of their spells as a spell book, but not magic missile. This isn't in diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java b/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java index e38dff2d..06d34db5 100644 --- a/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java +++ b/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java @@ -506,7 +506,7 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp // All wizards will buy spell books ItemStack anySpellBook = new ItemStack(WizardryItems.spell_book, 1, OreDictionary.WILDCARD_VALUE); - ItemStack crystalStack = new ItemStack(WizardryItems.crystal_magic, 5); + ItemStack crystalStack = new ItemStack(WizardryItems.magic_crystal, 5); this.trades.add(new MerchantRecipe(anySpellBook, crystalStack)); @@ -576,7 +576,7 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp if(itemToSell.isEmpty()) return; ItemStack secondItemToBuy = tier == Tier.MASTER ? new ItemStack(WizardryItems.astral_diamond) - : new ItemStack(WizardryItems.crystal_magic, tier.ordinal() * 3 + 1 + rand.nextInt(4)); + : new ItemStack(WizardryItems.magic_crystal, tier.ordinal() * 3 + 1 + rand.nextInt(4)); merchantrecipelist.add(new MerchantRecipe(this.getRandomPrice(tier), secondItemToBuy, itemToSell)); } diff --git a/src/main/java/electroblob/wizardry/integration/jei/ArcaneWorkbenchRecipe.java b/src/main/java/electroblob/wizardry/integration/jei/ArcaneWorkbenchRecipe.java index a8fede46..7f245140 100644 --- a/src/main/java/electroblob/wizardry/integration/jei/ArcaneWorkbenchRecipe.java +++ b/src/main/java/electroblob/wizardry/integration/jei/ArcaneWorkbenchRecipe.java @@ -97,9 +97,9 @@ public class ArcaneWorkbenchRecipe implements IRecipeWrapper { int count = MathHelper.ceil((float)mana / Constants.MANA_PER_CRYSTAL); // A stack of crystals will almost certainly be enough mana, but you never know! // Using ItemStack.EMPTY to avoid deprecated method; crystals' stack size is not stack-sensitive so it doesn't matter - if(count <= WizardryItems.crystal_magic.getItemStackLimit(ItemStack.EMPTY)){ + if(count <= WizardryItems.magic_crystal.getItemStackLimit(ItemStack.EMPTY)){ for (Element element : Element.values()) { - crystalStacks.add(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, "crystal_" + element.name().toLowerCase())), count)); + crystalStacks.add(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, element.name().toLowerCase() + "_crystal")), count)); } } diff --git a/src/main/java/electroblob/wizardry/integration/jei/ImbuementAltarRecipeCategory.java b/src/main/java/electroblob/wizardry/integration/jei/ImbuementAltarRecipeCategory.java index 14d4e1e9..e0e3e3fc 100644 --- a/src/main/java/electroblob/wizardry/integration/jei/ImbuementAltarRecipeCategory.java +++ b/src/main/java/electroblob/wizardry/integration/jei/ImbuementAltarRecipeCategory.java @@ -144,12 +144,12 @@ public class ImbuementAltarRecipeCategory implements IRecipeCategory recipes = new ArrayList<>(); - ItemStack input = new ItemStack(WizardryItems.crystal_magic); + ItemStack input = new ItemStack(WizardryItems.magic_crystal); for(Element element : Element.values()){ List> dusts = Collections.nCopies(4, Collections.singletonList(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, "spectral_dust_" + element.name().toLowerCase()))))); - ItemStack output = new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, "crystal_" + element.name().toLowerCase()))); + ItemStack output = new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, element.name().toLowerCase() + "_crystal"))); recipes.add(new ImbuementAltarRecipe(input, dusts, output)); } @@ -161,16 +161,17 @@ public class ImbuementAltarRecipeCategory implements IRecipeCategory recipes = new ArrayList<>(); - ItemStack input = new ItemStack(WizardryBlocks.crystal_block); + ItemStack input = new ItemStack(WizardryBlocks.magic_crystal_block); - for(Element element : Element.values()){ - if(element == Element.MAGIC) continue; + for (Element element : Element.values()) { + if (element == Element.MAGIC) { continue; } - int meta = element.ordinal(); - List> dusts = Collections.nCopies(4, Collections.singletonList(new ItemStack(ForgeRegistries.ITEMS.getValue( - new ResourceLocation(Wizardry.MODID, "spectral_dust_" + element.name().toLowerCase()))))); - ItemStack output = new ItemStack(WizardryBlocks.crystal_block, 1, meta); - recipes.add(new ImbuementAltarRecipe(input, dusts, output)); + List> dusts = Collections.nCopies(4, Collections.singletonList(new ItemStack(ForgeRegistries.ITEMS.getValue( + new ResourceLocation(Wizardry.MODID, "spectral_dust_" + element.name().toLowerCase()))))); + + ItemStack output = new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, element.getName().toLowerCase() + + "_crystal_block"))); + recipes.add(new ImbuementAltarRecipe(input, dusts, output)); } return recipes; diff --git a/src/main/java/electroblob/wizardry/integration/jei/WizardryJEIPlugin.java b/src/main/java/electroblob/wizardry/integration/jei/WizardryJEIPlugin.java index bba1d184..b2d3cb0b 100644 --- a/src/main/java/electroblob/wizardry/integration/jei/WizardryJEIPlugin.java +++ b/src/main/java/electroblob/wizardry/integration/jei/WizardryJEIPlugin.java @@ -66,7 +66,7 @@ public class WizardryJEIPlugin implements IModPlugin { } } - addItemInfo(registry, WizardryItems.crystal_magic); + addItemInfo(registry, WizardryItems.magic_crystal); addItemInfo(registry, WizardryItems.wizard_handbook); addItemInfo(registry, WizardryItems.crystal_shard); addItemInfo(registry, WizardryItems.grand_crystal); diff --git a/src/main/java/electroblob/wizardry/inventory/ContainerArcaneWorkbench.java b/src/main/java/electroblob/wizardry/inventory/ContainerArcaneWorkbench.java index f22b76e1..e555f4ac 100644 --- a/src/main/java/electroblob/wizardry/inventory/ContainerArcaneWorkbench.java +++ b/src/main/java/electroblob/wizardry/inventory/ContainerArcaneWorkbench.java @@ -92,7 +92,7 @@ public class ContainerArcaneWorkbench extends Container implements ISpellSortabl } this.addSlotToContainer(new SlotItemList(tileentity, CRYSTAL_SLOT, 13, 101, 64, - WizardryItems.crystal_magic, WizardryItems.crystal_shard, WizardryItems.grand_crystal)) + WizardryItems.magic_crystal, WizardryItems.crystal_shard, WizardryItems.grand_crystal)) .setBackgroundName(EMPTY_SLOT_CRYSTAL.toString()); this.addSlotToContainer(new SlotWorkbenchItem(tileentity, CENTRE_SLOT, 80, 64, this)); diff --git a/src/main/java/electroblob/wizardry/item/ItemArcaneTome.java b/src/main/java/electroblob/wizardry/item/ItemArcaneTome.java index 79827f1f..27b4b20e 100644 --- a/src/main/java/electroblob/wizardry/item/ItemArcaneTome.java +++ b/src/main/java/electroblob/wizardry/item/ItemArcaneTome.java @@ -40,7 +40,7 @@ public class ItemArcaneTome extends Item { tooltip.add(tier.getDisplayNameWithFormatting()); Tier tier2 = Tier.values()[tier.ordinal() - 1]; - Wizardry.proxy.addMultiLineDescription(tooltip, "item." + Wizardry.MODID + "arcane_tome.desc", + Wizardry.proxy.addMultiLineDescription(tooltip, "item." + Wizardry.MODID + ":arcane_tome.desc", tier2.getDisplayNameWithFormatting() + "\u00A77", tier.getDisplayNameWithFormatting() + "\u00A77"); } diff --git a/src/main/java/electroblob/wizardry/item/ItemCrystal.java b/src/main/java/electroblob/wizardry/item/ItemCrystal.java index 2cd05faf..2ad0e5f8 100644 --- a/src/main/java/electroblob/wizardry/item/ItemCrystal.java +++ b/src/main/java/electroblob/wizardry/item/ItemCrystal.java @@ -1,13 +1,7 @@ package electroblob.wizardry.item; -import electroblob.wizardry.Wizardry; -import electroblob.wizardry.constants.Element; import electroblob.wizardry.registry.WizardryTabs; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; /** Note that in 1.13, the flattening will make this class redundant, much like ItemCoal, which is probably its * closest analog in vanilla. */ diff --git a/src/main/java/electroblob/wizardry/registry/WizardryBlocks.java b/src/main/java/electroblob/wizardry/registry/WizardryBlocks.java index 3933afb0..90892dba 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryBlocks.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryBlocks.java @@ -2,6 +2,7 @@ package electroblob.wizardry.registry; import electroblob.wizardry.Wizardry; import electroblob.wizardry.block.*; +import electroblob.wizardry.constants.Element; import electroblob.wizardry.tileentity.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -43,7 +44,15 @@ public final class WizardryBlocks { public static final Block crystal_ore = placeholder(); public static final Block crystal_flower = placeholder(); public static final Block transportation_stone = placeholder(); - public static final Block crystal_block = placeholder(); + + public static final Block magic_crystal_block = placeholder(); + public static final Block fire_crystal_block = placeholder(); + public static final Block ice_crystal_block = placeholder(); + public static final Block lightning_crystal_block = placeholder(); + public static final Block necromancy_crystal_block = placeholder(); + public static final Block earth_crystal_block = placeholder(); + public static final Block sorcery_crystal_block = placeholder(); + public static final Block healing_crystal_block = placeholder(); public static final Block petrified_stone = placeholder(); public static final Block ice_statue = placeholder(); @@ -108,7 +117,15 @@ public final class WizardryBlocks { registerBlock(registry, "crystal_ore", new BlockCrystalOre(Material.ROCK).setHardness(3.0F).setCreativeTab(WizardryTabs.WIZARDRY)); registerBlock(registry, "crystal_flower", new BlockCrystalFlower(Material.PLANTS).setHardness(0.0F).setCreativeTab(WizardryTabs.WIZARDRY)); registerBlock(registry, "transportation_stone", new BlockTransportationStone(Material.ROCK).setHardness(0.3F).setLightLevel(0.5f).setLightOpacity(0).setCreativeTab(WizardryTabs.WIZARDRY)); - registerBlock(registry, "crystal_block", new BlockCrystal(Material.IRON).setHardness(5.0F).setResistance(10.0F).setCreativeTab(WizardryTabs.WIZARDRY)); + + registerBlock(registry, "magic_crystal_block", new BlockCrystal(Element.MAGIC).setHardness(5.0F).setResistance(10.0F).setCreativeTab(WizardryTabs.WIZARDRY)); + registerBlock(registry, "fire_crystal_block", new BlockCrystal(Element.MAGIC).setHardness(5.0F).setResistance(10.0F).setCreativeTab(WizardryTabs.WIZARDRY)); + registerBlock(registry, "ice_crystal_block", new BlockCrystal(Element.MAGIC).setHardness(5.0F).setResistance(10.0F).setCreativeTab(WizardryTabs.WIZARDRY)); + registerBlock(registry, "lightning_crystal_block", new BlockCrystal(Element.MAGIC).setHardness(5.0F).setResistance(10.0F).setCreativeTab(WizardryTabs.WIZARDRY)); + registerBlock(registry, "necromancy_crystal_block", new BlockCrystal(Element.MAGIC).setHardness(5.0F).setResistance(10.0F).setCreativeTab(WizardryTabs.WIZARDRY)); + registerBlock(registry, "earth_crystal_block", new BlockCrystal(Element.MAGIC).setHardness(5.0F).setResistance(10.0F).setCreativeTab(WizardryTabs.WIZARDRY)); + registerBlock(registry, "sorcery_crystal_block", new BlockCrystal(Element.MAGIC).setHardness(5.0F).setResistance(10.0F).setCreativeTab(WizardryTabs.WIZARDRY)); + registerBlock(registry, "healing_crystal_block", new BlockCrystal(Element.MAGIC).setHardness(5.0F).setResistance(10.0F).setCreativeTab(WizardryTabs.WIZARDRY)); registerBlock(registry, "petrified_stone", new BlockStatue(Material.ROCK).setHardness(1.5F).setResistance(10.0F)); registerBlock(registry, "ice_statue", new BlockStatue(Material.ICE).setHardness(0.5F).setLightOpacity(3)); diff --git a/src/main/java/electroblob/wizardry/registry/WizardryItems.java b/src/main/java/electroblob/wizardry/registry/WizardryItems.java index dab2706d..33ce171b 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryItems.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryItems.java @@ -80,14 +80,14 @@ public final class WizardryItems { // point where all the items were listed, but that's not possible within the current system unless you use an array, // which means you lose the individual fields... - public static final Item crystal_magic = placeholder(); - public static final Item crystal_earth = placeholder(); - public static final Item crystal_fire = placeholder(); - public static final Item crystal_healing = placeholder(); - public static final Item crystal_ice = placeholder(); - public static final Item crystal_lightning = placeholder(); - public static final Item crystal_necromancy = placeholder(); - public static final Item crystal_sorcery = placeholder(); + public static final Item magic_crystal = placeholder(); + public static final Item earth_crystal = placeholder(); + public static final Item fire_crystal = placeholder(); + public static final Item healing_crystal = placeholder(); + public static final Item ice_crystal = placeholder(); + public static final Item lightning_crystal = placeholder(); + public static final Item necromancy_crystal = placeholder(); + public static final Item sorcery_crystal = placeholder(); public static final Item grand_crystal = placeholder(); public static final Item crystal_shard = placeholder(); @@ -560,7 +560,15 @@ public final class WizardryItems { String[] elements = Arrays.stream(Element.values()).map(Element::getName).toArray(String[]::new); String[] woodTypes = Arrays.stream(BlockPlanks.EnumType.values()).map(BlockPlanks.EnumType::getName).toArray(String[]::new); - registerMultiTexturedItemBlock(registry, WizardryBlocks.crystal_block, true, elements); + registerItemBlock(registry, WizardryBlocks.magic_crystal_block); + registerItemBlock(registry, WizardryBlocks.fire_crystal_block); + registerItemBlock(registry, WizardryBlocks.ice_crystal_block); + registerItemBlock(registry, WizardryBlocks.lightning_crystal_block); + registerItemBlock(registry, WizardryBlocks.necromancy_crystal_block); + registerItemBlock(registry, WizardryBlocks.earth_crystal_block); + registerItemBlock(registry, WizardryBlocks.sorcery_crystal_block); + registerItemBlock(registry, WizardryBlocks.healing_crystal_block); + registerMultiTexturedItemBlock(registry, WizardryBlocks.runestone, false, elements); registerMultiTexturedItemBlock(registry, WizardryBlocks.runestone_pedestal, false, elements); registerMultiTexturedItemBlock(registry, WizardryBlocks.gilded_wood, true, woodTypes); @@ -584,14 +592,14 @@ public final class WizardryItems { // Items - registerItem(registry, "crystal_magic", new ItemCrystal()); - registerItem(registry, "crystal_earth", new ItemCrystal()); - registerItem(registry, "crystal_fire", new ItemCrystal()); - registerItem(registry, "crystal_healing", new ItemCrystal()); - registerItem(registry, "crystal_ice", new ItemCrystal()); - registerItem(registry, "crystal_lightning", new ItemCrystal()); - registerItem(registry, "crystal_necromancy", new ItemCrystal()); - registerItem(registry, "crystal_sorcery", new ItemCrystal()); + registerItem(registry, "magic_crystal", new ItemCrystal()); + registerItem(registry, "earth_crystal", new ItemCrystal()); + registerItem(registry, "fire_crystal", new ItemCrystal()); + registerItem(registry, "healing_crystal", new ItemCrystal()); + registerItem(registry, "ice_crystal", new ItemCrystal()); + registerItem(registry, "lightning_crystal", new ItemCrystal()); + registerItem(registry, "necromancy_crystal", new ItemCrystal()); + registerItem(registry, "sorcery_crystal", new ItemCrystal()); registerItem(registry, "crystal_shard", new Item().setCreativeTab(WizardryTabs.WIZARDRY)); registerItem(registry, "grand_crystal", new Item().setCreativeTab(WizardryTabs.WIZARDRY)); diff --git a/src/main/java/electroblob/wizardry/registry/WizardryRecipes.java b/src/main/java/electroblob/wizardry/registry/WizardryRecipes.java index 69c38e31..5d2b5e7b 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryRecipes.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryRecipes.java @@ -59,7 +59,7 @@ public final class WizardryRecipes { IForgeRegistry registry = event.getRegistry(); - FurnaceRecipes.instance().addSmeltingRecipeForBlock(WizardryBlocks.crystal_ore, new ItemStack(WizardryItems.crystal_magic), 0.5f); + FurnaceRecipes.instance().addSmeltingRecipeForBlock(WizardryBlocks.crystal_ore, new ItemStack(WizardryItems.magic_crystal), 0.5f); // Mana flask recipes diff --git a/src/main/java/electroblob/wizardry/tileentity/TileEntityImbuementAltar.java b/src/main/java/electroblob/wizardry/tileentity/TileEntityImbuementAltar.java index 0b8cd822..8397b820 100644 --- a/src/main/java/electroblob/wizardry/tileentity/TileEntityImbuementAltar.java +++ b/src/main/java/electroblob/wizardry/tileentity/TileEntityImbuementAltar.java @@ -256,8 +256,7 @@ public class TileEntityImbuementAltar extends TileEntity implements ITickable { } } - if((input.getItem() == WizardryItems.crystal_magic || input.getItem() == Item.getItemFromBlock(WizardryBlocks.crystal_block)) - && input.getMetadata() == 0){ + if((input.getItem() == WizardryItems.magic_crystal || input.getItem() == Item.getItemFromBlock(WizardryBlocks.magic_crystal_block))){ if(Arrays.stream(receptacleElements).distinct().count() == 1 && receptacleElements[0] != null){ // All the same element return new ItemStack(input.getItem(), input.getCount(), receptacleElements[0].ordinal()); diff --git a/src/main/resources/assets/ebwizardry/advancements/crystal.json b/src/main/resources/assets/ebwizardry/advancements/crystal.json index 9dcc0773..13110bd9 100644 --- a/src/main/resources/assets/ebwizardry/advancements/crystal.json +++ b/src/main/resources/assets/ebwizardry/advancements/crystal.json @@ -7,8 +7,7 @@ "translate": "advancement.ebwizardry:crystal.desc" }, "icon": { - "item": "ebwizardry:magic_crystal", - "data": 0 + "item": "ebwizardry:magic_crystal" } }, "parent": "ebwizardry:root", @@ -18,8 +17,28 @@ "conditions": { "items": [ { - "item": "ebwizardry:magic_crystal", - "data": 0 + "item": "ebwizardry:magic_crystal" + }, + { + "item": "ebwizardry:fire_crystal" + }, + { + "item": "ebwizardry:ice_crystal" + }, + { + "item": "ebwizardry:lightning_crystal" + }, + { + "item": "ebwizardry:necromancy_crystal" + }, + { + "item": "ebwizardry:earth_crystal" + }, + { + "item": "ebwizardry:sorcery_crystal" + }, + { + "item": "ebwizardry:healing_crystal" } ] } diff --git a/src/main/resources/assets/ebwizardry/advancements/defeat_remnant.json b/src/main/resources/assets/ebwizardry/advancements/defeat_remnant.json index c5203c08..042afc8a 100644 --- a/src/main/resources/assets/ebwizardry/advancements/defeat_remnant.json +++ b/src/main/resources/assets/ebwizardry/advancements/defeat_remnant.json @@ -7,8 +7,7 @@ "translate": "advancement.ebwizardry:defeat_remnant.desc" }, "icon": { - "item": "ebwizardry:spectral_dust", - "data": 6 + "item": "ebwizardry:spectral_dust_sorcery" } }, "parent": "ebwizardry:arcane_initiate", @@ -18,8 +17,7 @@ "conditions": { "items": [ { - "item": "ebwizardry:spectral_dust", - "data": 1 + "item": "ebwizardry:spectral_dust_fire" } ] } @@ -29,8 +27,7 @@ "conditions": { "items": [ { - "item": "ebwizardry:spectral_dust", - "data": 2 + "item": "ebwizardry:spectral_dust_ice" } ] } @@ -40,8 +37,7 @@ "conditions": { "items": [ { - "item": "ebwizardry:spectral_dust", - "data": 3 + "item": "ebwizardry:spectral_dust_lightning" } ] } @@ -51,8 +47,7 @@ "conditions": { "items": [ { - "item": "ebwizardry:spectral_dust", - "data": 4 + "item": "ebwizardry:spectral_dust_necromancy" } ] } @@ -62,8 +57,7 @@ "conditions": { "items": [ { - "item": "ebwizardry:spectral_dust", - "data": 5 + "item": "ebwizardry:spectral_dust_earth" } ] } @@ -73,8 +67,7 @@ "conditions": { "items": [ { - "item": "ebwizardry:spectral_dust", - "data": 6 + "item": "ebwizardry:spectral_dust_sorcery" } ] } @@ -84,7 +77,7 @@ "conditions": { "items": [ { - "item": "ebwizardry:spectral_dust", + "item": "ebwizardry:spectral_healing", "data": 7 } ] diff --git a/src/main/resources/assets/ebwizardry/lang/de_de.lang b/src/main/resources/assets/ebwizardry/lang/de_de.lang index 7f11b3c9..6acf0181 100644 --- a/src/main/resources/assets/ebwizardry/lang/de_de.lang +++ b/src/main/resources/assets/ebwizardry/lang/de_de.lang @@ -53,14 +53,14 @@ tile.ebwizardry\:dark_oak_lectern.name=Schwarzeichenholz Pult tile.ebwizardry\:receptacle.name=Gefäß tile.ebwizardry\:imbuement_altar.name=Ermächtungsaltar -item.ebwizardry\:crystal_magic.name=Magischer Kristall -item.ebwizardry\:crystal_fire.name=Feuriger Kristall -item.ebwizardry\:crystal_ice.name=Eisiger Kristall -item.ebwizardry\:crystal_lightning.name=Stürmischer Kristall -item.ebwizardry\:crystal_necromancy.name=Dunkler Kristall -item.ebwizardry\:crystal_earth.name=Erdkristall -item.ebwizardry\:crystal_sorcery.name=Mystischer Kristall -item.ebwizardry\:crystal_healing.name=Strahlender Kristall +item.ebwizardry\:magic_crystal.name=Magischer Kristall +item.ebwizardry\:fire_crystal.name=Feuriger Kristall +item.ebwizardry\:ice_crystal.name=Eisiger Kristall +item.ebwizardry\:lightning_crystal.name=Stürmischer Kristall +item.ebwizardry\:necromancy_crystal.name=Dunkler Kristall +item.ebwizardry\:earth_crystal.name=Erdkristall +item.ebwizardry\:sorcery_crystal.name=Mystischer Kristall +item.ebwizardry\:healing_crystal.name=Strahlender Kristall item.ebwizardry\:magic_wand.name=Magischer Zauberstab item.ebwizardry\:apprentice_wand.name=Lehrlingszauberstab @@ -184,7 +184,13 @@ item.ebwizardry\:armour_upgrade.desc_extended=%1$sum sie %2$slegendär zu machen item.ebwizardry\:magic_silk.name=Magische Seide -item.ebwizardry\:spectral_dust.name=Spektraler Staub +item.ebwizardry\:spectral_dust_fire.name=Spektraler Staub +item.ebwizardry\:spectral_dust_ice.name=Spektraler Staub +item.ebwizardry\:spectral_dust_lightning.name=Spektraler Staub +item.ebwizardry\:spectral_dust_healing.name=Spektraler Staub +item.ebwizardry\:spectral_dust_sorcery.name=Spektraler Staub +item.ebwizardry\:spectral_dust_necromancy.name=Spektraler Staub +item.ebwizardry\:spectral_dust_healing.name=Spektraler Staub item.ebwizardry\:wizard_armour.legendary=Legendär item.ebwizardry\:wizard_armour.buff=-%1$s %2$s Kosten diff --git a/src/main/resources/assets/ebwizardry/lang/en_gb.lang b/src/main/resources/assets/ebwizardry/lang/en_gb.lang index 88e9f180..645da6fe 100644 --- a/src/main/resources/assets/ebwizardry/lang/en_gb.lang +++ b/src/main/resources/assets/ebwizardry/lang/en_gb.lang @@ -52,22 +52,22 @@ tile.ebwizardry\:dark_oak_lectern.name=Dark Oak Lectern tile.ebwizardry\:receptacle.name=Receptacle tile.ebwizardry\:imbuement_altar.name=Imbuement Altar -item.ebwizardry\:crystal_magic.name=Magic Crystal -item.ebwizardry\:crystal_magic.desc=The iridescent colours of this crystal seem to slowly shift and swirl, hinting at a magical energy within. Perhaps this magic could be harnessed in some way? -item.ebwizardry\:crystal_fire.name=Fiery Crystal -item.ebwizardry\:crystal_fire.desc=A crystal that glows a fiery orange. Maybe it is the key to unlocking the element of fire... -item.ebwizardry\:crystal_ice.name=Icy Crystal -item.ebwizardry\:crystal_ice.desc=A crystal with a cold, bluish tint. Perhaps it holds the secrets to the power of frost... -item.ebwizardry\:crystal_lightning.name=Stormy Crystal -item.ebwizardry\:crystal_lightning.desc=A crystal that seems to swirl and flash with a chaotic energy. Maybe it hides a greater power within... -item.ebwizardry\:crystal_necromancy.name=Dark Crystal -item.ebwizardry\:crystal_necromancy.desc=A crystal with a deep, purplish appearance that seems to draw you in. Perhaps it is a gateway to something darker... -item.ebwizardry\:crystal_earth.name=Verdant Crystal -item.ebwizardry\:crystal_earth.desc=A crystal patterened with a great many greens and browns. Perhaps it holds a connection to the forces of nature... -item.ebwizardry\:crystal_sorcery.name=Mystical Crystal -item.ebwizardry\:crystal_sorcery.desc=A crystal that glimmers with a bluish-green light. Maybe it conceals the secrets of an ancient force... -item.ebwizardry\:crystal_healing.name=Radiant Crystal -item.ebwizardry\:crystal_healing.desc=A crystal that glints a golden yellow in the sunlight. Perhaps it possesses the link to a divine power... +item.ebwizardry\:magic_crystal.name=Magic Crystal +item.ebwizardry\:magic_crystal.desc=The iridescent colours of this crystal seem to slowly shift and swirl, hinting at a magical energy within. Perhaps this magic could be harnessed in some way? +item.ebwizardry\:fire_crystal.name=Fiery Crystal +item.ebwizardry\:fire_crystal.desc=A crystal that glows a fiery orange. Maybe it is the key to unlocking the element of fire... +item.ebwizardry\:ice_crystal.name=Icy Crystal +item.ebwizardry\:ice_crystal.desc=A crystal with a cold, bluish tint. Perhaps it holds the secrets to the power of frost... +item.ebwizardry\:lightning_crystal.name=Stormy Crystal +item.ebwizardry\:lightning_crystal.desc=A crystal that seems to swirl and flash with a chaotic energy. Maybe it hides a greater power within... +item.ebwizardry\:necromancy_crystal.name=Dark Crystal +item.ebwizardry\:necromancy_crystal.desc=A crystal with a deep, purplish appearance that seems to draw you in. Perhaps it is a gateway to something darker... +item.ebwizardry\:earth_crystal.name=Verdant Crystal +item.ebwizardry\:earth_crystal.desc=A crystal patterened with a great many greens and browns. Perhaps it holds a connection to the forces of nature... +item.ebwizardry\:sorcery_crystal.name=Mystical Crystal +item.ebwizardry\:sorcery_crystal.desc=A crystal that glimmers with a bluish-green light. Maybe it conceals the secrets of an ancient force... +item.ebwizardry\:healing_crystal.name=Radiant Crystal +item.ebwizardry\:healing_crystal.desc=A crystal that glints a golden yellow in the sunlight. Perhaps it possesses the link to a divine power... item.ebwizardry\:spell_book.name=Spell Book item.ebwizardry\:spell_book.desc=A book filled with the runes and glyphs of an ancient script. Perhaps with dedication, one might be able to decipher its contents...\n\nRight-click while holding this book to read it. diff --git a/src/main/resources/assets/ebwizardry/lang/en_us.lang b/src/main/resources/assets/ebwizardry/lang/en_us.lang index 81d763f9..2fd5f1f8 100644 --- a/src/main/resources/assets/ebwizardry/lang/en_us.lang +++ b/src/main/resources/assets/ebwizardry/lang/en_us.lang @@ -52,22 +52,22 @@ tile.ebwizardry\:dark_oak_lectern.name=Dark Oak Lectern tile.ebwizardry\:receptacle.name=Receptacle tile.ebwizardry\:imbuement_altar.name=Imbuement Altar -item.ebwizardry\:crystal_magic.name=Magic Crystal -item.ebwizardry\:crystal_magic.desc=The iridescent colors of this crystal seem to slowly shift and swirl, hinting at a magical energy within. Perhaps this magic could be harnessed, somehow... -item.ebwizardry\:crystal_fire.name=Fiery Crystal -item.ebwizardry\:crystal_fire.desc=A crystal that glows a fiery orange. Maybe it is the key to unlocking the element of fire... -item.ebwizardry\:crystal_ice.name=Icy Crystal -item.ebwizardry\:crystal_ice.desc=A crystal with a cold, bluish tint. Perhaps it holds the secrets to the power of frost... -item.ebwizardry\:crystal_lightning.name=Stormy Crystal -item.ebwizardry\:crystal_lightning.desc=A crystal that seems to swirl and flash with a chaotic energy. Maybe it hides a greater power within... -item.ebwizardry\:crystal_necromancy.name=Dark Crystal -item.ebwizardry\:crystal_necromancy.desc=A crystal with a deep, purplish appearance that seems to draw you in. Perhaps it is a gateway to something darker... -item.ebwizardry\:crystal_earth.name=Verdant Crystal -item.ebwizardry\:crystal_earth.desc=A crystal patterened with a great many greens and browns. Perhaps it holds a connection to the forces of nature... -item.ebwizardry\:crystal_sorcery.name=Mystical Crystal -item.ebwizardry\:crystal_sorcery.desc=A crystal that glimmers with a bluish-green light. Maybe it conceals the secrets of an ancient force... -item.ebwizardry\:crystal_healing.name=Radiant Crystal -item.ebwizardry\:crystal_healing.desc=A crystal that glints a golden yellow in the sunlight. Perhaps it possesses the link to a divine power... +item.ebwizardry\:magic_crystal.name=Magic Crystal +item.ebwizardry\:magic_crystal.desc=The iridescent colors of this crystal seem to slowly shift and swirl, hinting at a magical energy within. Perhaps this magic could be harnessed, somehow... +item.ebwizardry\:fire_crystal.name=Fiery Crystal +item.ebwizardry\:fire_crystal.desc=A crystal that glows a fiery orange. Maybe it is the key to unlocking the element of fire... +item.ebwizardry\:ice_crystal.name=Icy Crystal +item.ebwizardry\:ice_crystal.desc=A crystal with a cold, bluish tint. Perhaps it holds the secrets to the power of frost... +item.ebwizardry\:lightning_crystal.name=Stormy Crystal +item.ebwizardry\:lightning_crystal.desc=A crystal that seems to swirl and flash with a chaotic energy. Maybe it hides a greater power within... +item.ebwizardry\:necromancy_crystal.name=Dark Crystal +item.ebwizardry\:necromancy_crystal.desc=A crystal with a deep, purplish appearance that seems to draw you in. Perhaps it is a gateway to something darker... +item.ebwizardry\:earth_crystal.name=Verdant Crystal +item.ebwizardry\:earth_crystal.desc=A crystal patterened with a great many greens and browns. Perhaps it holds a connection to the forces of nature... +item.ebwizardry\:sorcery_crystal.name=Mystical Crystal +item.ebwizardry\:sorcery_crystal.desc=A crystal that glimmers with a bluish-green light. Maybe it conceals the secrets of an ancient force... +item.ebwizardry\:healing_crystal.name=Radiant Crystal +item.ebwizardry\:healing_crystal.desc=A crystal that glints a golden yellow in the sunlight. Perhaps it possesses the link to a divine power... item.ebwizardry\:spell_book.name=Spell Book item.ebwizardry\:spell_book.desc=A book filled with the runes and glyphs of an ancient script. Perhaps with dedication, one might be able to decipher its contents...\n\nRight-click while holding this book to read it. diff --git a/src/main/resources/assets/ebwizardry/lang/fr_fr.lang b/src/main/resources/assets/ebwizardry/lang/fr_fr.lang index 09910df6..98a4c6b5 100644 --- a/src/main/resources/assets/ebwizardry/lang/fr_fr.lang +++ b/src/main/resources/assets/ebwizardry/lang/fr_fr.lang @@ -52,22 +52,22 @@ tile.ebwizardry\:dark_oak_lectern.name=Lutrin de chêne noir tile.ebwizardry\:receptacle.name=Receptacle tile.ebwizardry\:imbuement_altar.name=Autel d'infusion -item.ebwizardry\:crystal_magic.name=Cristal magique -item.ebwizardry\:crystal_magic.desc=Les couleurs iridescentes du cristal tourbillonnent doucement, révélant sa magie. Il y a sûrement un moyen de l'utiliser... -item.ebwizardry\:crystal_fire.name=Cristal embrasé -item.ebwizardry\:crystal_fire.desc=Un cristal brillant d'un orange chatoyant. C'est sûrement la clef pour déverrouiller l'élément du feu... -item.ebwizardry\:crystal_ice.name=Cristal gelé -item.ebwizardry\:crystal_ice.desc=Un cristal teinté d'un bleu glacial. Il renferme sûrement les secrets du froid... -item.ebwizardry\:crystal_lightning.name=Cristal foudroyant -item.ebwizardry\:crystal_lightning.desc=Un cristal vibrant d'une énergie chaotique. Il cache probablement un pouvoir grandiose... -item.ebwizardry\:crystal_necromancy.name=Cristal ténébreux -item.ebwizardry\:crystal_necromancy.desc=Un cristal sombre et violacé. Il s'agit sûrement d'une clef pour un sombre pouvoir... -item.ebwizardry\:crystal_earth.name=Cristal verdoyant -item.ebwizardry\:crystal_earth.desc=Un cristal empreint de filaments verdoyants. Il doit sûrement contenir les pouvoirs de la nature... -item.ebwizardry\:crystal_sorcery.name=Cristal mystique -item.ebwizardry\:crystal_sorcery.desc=Un cristal luisant d'un vert bleuté. Il semble recéler une magie antique... -item.ebwizardry\:crystal_healing.name=Cristal rayonnant -item.ebwizardry\:crystal_healing.desc=Un cristal au rayonnement doré. Il doit être lié à un pouvoir divin... +item.ebwizardry\:magic_crystal.name=Cristal magique +item.ebwizardry\:magic_crystal.desc=Les couleurs iridescentes du cristal tourbillonnent doucement, révélant sa magie. Il y a sûrement un moyen de l'utiliser... +item.ebwizardry\:fire_crystal.name=Cristal embrasé +item.ebwizardry\:fire_crystal.desc=Un cristal brillant d'un orange chatoyant. C'est sûrement la clef pour déverrouiller l'élément du feu... +item.ebwizardry\:ice_crystal.name=Cristal gelé +item.ebwizardry\:ice_crystal.desc=Un cristal teinté d'un bleu glacial. Il renferme sûrement les secrets du froid... +item.ebwizardry\:lightning_crystal.name=Cristal foudroyant +item.ebwizardry\:lightning_crystal.desc=Un cristal vibrant d'une énergie chaotique. Il cache probablement un pouvoir grandiose... +item.ebwizardry\:necromancy_crystal.name=Cristal ténébreux +item.ebwizardry\:necromancy_crystal.desc=Un cristal sombre et violacé. Il s'agit sûrement d'une clef pour un sombre pouvoir... +item.ebwizardry\:earth_crystal.name=Cristal verdoyant +item.ebwizardry\:earth_crystal.desc=Un cristal empreint de filaments verdoyants. Il doit sûrement contenir les pouvoirs de la nature... +item.ebwizardry\:sorcery_crystal.name=Cristal mystique +item.ebwizardry\:sorcery_crystal.desc=Un cristal luisant d'un vert bleuté. Il semble recéler une magie antique... +item.ebwizardry\:healing_crystal.name=Cristal rayonnant +item.ebwizardry\:healing_crystal.desc=Un cristal au rayonnement doré. Il doit être lié à un pouvoir divin... item.ebwizardry\:spell_book.name=Livre de sorts item.ebwizardry\:spell_book.desc=Un livre rempli de glyphes et de runes antiques. Avec de l'agnégation, il devrait être possible de le décrypter...\n\nClic droit en tenant le livre pour le lire. diff --git a/src/main/resources/assets/ebwizardry/lang/hu_hu.lang b/src/main/resources/assets/ebwizardry/lang/hu_hu.lang index a602a70a..9cf76e28 100644 --- a/src/main/resources/assets/ebwizardry/lang/hu_hu.lang +++ b/src/main/resources/assets/ebwizardry/lang/hu_hu.lang @@ -52,22 +52,22 @@ tile.ebwizardry\:dark_oak_lectern.name=Sötéttölgy Olvasóállvány tile.ebwizardry\:receptacle.name=Receptákulum tile.ebwizardry\:imbuement_altar.name=Oltár -item.ebwizardry\:crystal_magic.name=Varázskristály -item.ebwizardry\:crystal_magic.desc=A kristály belsejében lassan kavargó, irizáló színek mágikus energiáról tanúskodnak. Ezt az energiát ha ki lehetne nyerni, valahogy... -item.ebwizardry\:crystal_fire.name=Tüzes Kristály -item.ebwizardry\:crystal_fire.desc=Tüzes narancsszínnel izzó kristály. Ez lehet a kulcs a tűz elem titkainak feltárásához... -item.ebwizardry\:crystal_ice.name=Jeges Kristály -item.ebwizardry\:crystal_ice.desc=Hideg, kékes árnyalatú kristály. A fagy erejének titkait rejtheti... -item.ebwizardry\:crystal_lightning.name=Viharos Kristály -item.ebwizardry\:crystal_lightning.desc=Gomolygó és kaotikus energiával villogó kristály. Hatalmas erőt rejthet magában... -item.ebwizardry\:crystal_necromancy.name=Sötét Kristály -item.ebwizardry\:crystal_necromancy.desc=Mélységes lila kristály, mely ha ránézel szinte magába szippant. Valami még sötétebb kapuja lehet... -item.ebwizardry\:crystal_earth.name=Viruló Kristály -item.ebwizardry\:crystal_earth.desc=Zöld és barna temérdek árnyalatával mintázott kristály. Kapcsolata lehet a természet erőivel... -item.ebwizardry\:crystal_sorcery.name=Misztikus Kristály -item.ebwizardry\:crystal_sorcery.desc=Kékeszöld fénnyel csillogó kristály. Ősi erők titkait rejtheti magában... -item.ebwizardry\:crystal_healing.name=Sugárzó Kristály -item.ebwizardry\:crystal_healing.desc=A napsugárban aranyszín sárgán megcsillanó kristály. Tán isteni hatalomhoz rejt kapcsot... +item.ebwizardry\:magic_crystal.name=Varázskristály +item.ebwizardry\:magic_crystal.desc=A kristály belsejében lassan kavargó, irizáló színek mágikus energiáról tanúskodnak. Ezt az energiát ha ki lehetne nyerni, valahogy... +item.ebwizardry\:fire_crystal.name=Tüzes Kristály +item.ebwizardry\:fire_crystal.desc=Tüzes narancsszínnel izzó kristály. Ez lehet a kulcs a tűz elem titkainak feltárásához... +item.ebwizardry\:ice_crystal.name=Jeges Kristály +item.ebwizardry\:ice_crystal.desc=Hideg, kékes árnyalatú kristály. A fagy erejének titkait rejtheti... +item.ebwizardry\:lightning_crystal.name=Viharos Kristály +item.ebwizardry\:lightning_crystal.desc=Gomolygó és kaotikus energiával villogó kristály. Hatalmas erőt rejthet magában... +item.ebwizardry\:necromancy_crystal.name=Sötét Kristály +item.ebwizardry\:necromancy_crystal.desc=Mélységes lila kristály, mely ha ránézel szinte magába szippant. Valami még sötétebb kapuja lehet... +item.ebwizardry\:earth_crystal.name=Viruló Kristály +item.ebwizardry\:earth_crystal.desc=Zöld és barna temérdek árnyalatával mintázott kristály. Kapcsolata lehet a természet erőivel... +item.ebwizardry\:sorcery_crystal.name=Misztikus Kristály +item.ebwizardry\:sorcery_crystal.desc=Kékeszöld fénnyel csillogó kristály. Ősi erők titkait rejtheti magában... +item.ebwizardry\:healing_crystal.name=Sugárzó Kristály +item.ebwizardry\:healing_crystal.desc=A napsugárban aranyszín sárgán megcsillanó kristály. Tán isteni hatalomhoz rejt kapcsot... item.ebwizardry\:spell_book.name=Varázskönyv item.ebwizardry\:spell_book.desc=Egy könyv, egy ősi nyelv rúnáival és szimbólumaival tele. Elegendő eltökéltséggel talán meg lehetne fejteni tartalmát...\n\nJobb-kattintással nyisd meg a könyvet, hogy elolvashasd. diff --git a/src/main/resources/assets/ebwizardry/lang/ko_kr.lang b/src/main/resources/assets/ebwizardry/lang/ko_kr.lang index b2596484..974970c9 100644 --- a/src/main/resources/assets/ebwizardry/lang/ko_kr.lang +++ b/src/main/resources/assets/ebwizardry/lang/ko_kr.lang @@ -52,22 +52,22 @@ tile.ebwizardry\:dark_oak_lectern.name=짙은 참나무 독서대 tile.ebwizardry\:receptacle.name=받침 tile.ebwizardry\:imbuement_altar.name=고취의 제단 -item.ebwizardry\:crystal_magic.name=마법수정 -item.ebwizardry\:crystal_magic.desc=무지갯빛의 아름다운 수정, 마법의 기운이 내부에서 서서히 변화하며 소용돌이치고 있습니다. 어쩌면 이 수정은 사용하면... -item.ebwizardry\:crystal_fire.name=화염의 수정 -item.ebwizardry\:crystal_fire.desc=주황빛으로 불타는 수정, 어쩌면 불의 원소를 푸는 열쇠일지도 모릅니다... -item.ebwizardry\:crystal_ice.name=얼음의 수정 -item.ebwizardry\:crystal_ice.desc=푸르스름한 색조의 차가운 수정, 어쩌면 서리의 힘의 비밀을 간직하고 있을지도 모릅니다... -item.ebwizardry\:crystal_lightning.name=폭풍의 수정 -item.ebwizardry\:crystal_lightning.desc=어지럽게 소용돌이치고 번쩍이는 수정, 어쩌면 더 큰 힘을 숨기고 있을지도 모릅니다... -item.ebwizardry\:crystal_necromancy.name=어둠의 수정 -item.ebwizardry\:crystal_necromancy.desc=마치 끌어당기는 듯한 깊고 푸르스름한 수정, 어쩌면 더 어두운 곳으로 가는 관문일지도 모릅니다... -item.ebwizardry\:crystal_earth.name=신록의 수정 -item.ebwizardry\:crystal_earth.desc=녹색과 약간의 갈색으로 이루어진 수정, 어쩌면 자연의 힘과 연관이 있을지도 모릅니다... -item.ebwizardry\:crystal_sorcery.name=신령의 수정 -item.ebwizardry\:crystal_sorcery.desc=푸르스름한 초록빛의 반짝거리는 수정, 어쩌면 고대의 힘의 비밀을 감추고 있을지도 모릅니다... -item.ebwizardry\:crystal_healing.name=복사의 수정 -item.ebwizardry\:crystal_healing.desc=금빛 햇살처럼 노랗게 반짝이는 수정, 어쩌면 신성한 힘의 연결고리일지도 모릅니다... +item.ebwizardry\:magic_crystal.name=마법수정 +item.ebwizardry\:magic_crystal.desc=무지갯빛의 아름다운 수정, 마법의 기운이 내부에서 서서히 변화하며 소용돌이치고 있습니다. 어쩌면 이 수정은 사용하면... +item.ebwizardry\:fire_crystal.name=화염의 수정 +item.ebwizardry\:fire_crystal.desc=주황빛으로 불타는 수정, 어쩌면 불의 원소를 푸는 열쇠일지도 모릅니다... +item.ebwizardry\:ice_crystal.name=얼음의 수정 +item.ebwizardry\:ice_crystal.desc=푸르스름한 색조의 차가운 수정, 어쩌면 서리의 힘의 비밀을 간직하고 있을지도 모릅니다... +item.ebwizardry\:lightning_crystal.name=폭풍의 수정 +item.ebwizardry\:lightning_crystal.desc=어지럽게 소용돌이치고 번쩍이는 수정, 어쩌면 더 큰 힘을 숨기고 있을지도 모릅니다... +item.ebwizardry\:necromancy_crystal.name=어둠의 수정 +item.ebwizardry\:necromancy_crystal.desc=마치 끌어당기는 듯한 깊고 푸르스름한 수정, 어쩌면 더 어두운 곳으로 가는 관문일지도 모릅니다... +item.ebwizardry\:earth_crystal.name=신록의 수정 +item.ebwizardry\:earth_crystal.desc=녹색과 약간의 갈색으로 이루어진 수정, 어쩌면 자연의 힘과 연관이 있을지도 모릅니다... +item.ebwizardry\:sorcery_crystal.name=신령의 수정 +item.ebwizardry\:sorcery_crystal.desc=푸르스름한 초록빛의 반짝거리는 수정, 어쩌면 고대의 힘의 비밀을 감추고 있을지도 모릅니다... +item.ebwizardry\:healing_crystal.name=복사의 수정 +item.ebwizardry\:healing_crystal.desc=금빛 햇살처럼 노랗게 반짝이는 수정, 어쩌면 신성한 힘의 연결고리일지도 모릅니다... item.ebwizardry\:spell_book.name=주문서 item.ebwizardry\:spell_book.desc=고대의 상형문자와 룬 문자로 채워진 책. 노력을 통해 그 내용을 해독할 수 있을 것 같습니다...\n\n책을 읽으려면 오른쪽 버튼을 누르세요. diff --git a/src/main/resources/assets/ebwizardry/lang/pl_pl.lang b/src/main/resources/assets/ebwizardry/lang/pl_pl.lang index 0e66ca0d..7611a17a 100644 --- a/src/main/resources/assets/ebwizardry/lang/pl_pl.lang +++ b/src/main/resources/assets/ebwizardry/lang/pl_pl.lang @@ -55,14 +55,14 @@ tile.ebwizardry\:imbuement_altar.name=Nasycony Ołtarz -item.ebwizardry\:crystal_magic.name=Magiczny Kryształ -item.ebwizardry\:crystal_fire.name=Ognisty Kryształ -item.ebwizardry\:crystal_ice.name=Lodowy Kryształ -item.ebwizardry\:crystal_lightning.name=Sztormowy Kryształ -item.ebwizardry\:crystal_necromancy.name=Mroczny Kryształ -item.ebwizardry\:crystal_earth.name=Zielny Kryształ -item.ebwizardry\:crystal_sorcery.name=Mistyczny Kryształ -item.ebwizardry\:crystal_healing.name=Promienisty Kryształ +item.ebwizardry\:magic_crystal.name=Magiczny Kryształ +item.ebwizardry\:fire_crystal.name=Ognisty Kryształ +item.ebwizardry\:ice_crystal.name=Lodowy Kryształ +item.ebwizardry\:lightning_crystal.name=Sztormowy Kryształ +item.ebwizardry\:necromancy_crystal.name=Mroczny Kryształ +item.ebwizardry\:earth_crystal.name=Zielny Kryształ +item.ebwizardry\:sorcery_crystal.name=Mistyczny Kryształ +item.ebwizardry\:healing_crystal.name=Promienisty Kryształ item.ebwizardry\:magic_wand.name=Magiczna Różdżka item.ebwizardry\:apprentice_wand.name=Uczniowska Różdżka @@ -454,7 +454,7 @@ entity.ebwizardry\:skeleton_minion.name=Szkielet entity.ebwizardry\:stray_minion.name=Tułacz entity.ebwizardry\:spider_minion.name=Pająk entity.ebwizardry\:blaze_minion.name=Płomyk -entity.ebwizardry\:wither_skeleton_minion.name=Obumary Szkielet +entity.ebwizardry\:wither_skeleton_minion.name=Obumar�y Szkielet entity.ebwizardry\:ice_wraith.name=Sługa Lodu entity.ebwizardry\:lightning_wraith.name=Sługa Piorunów entity.ebwizardry\:shadow_wraith.name=Sługa Cienia diff --git a/src/main/resources/assets/ebwizardry/lang/ru_ru.lang b/src/main/resources/assets/ebwizardry/lang/ru_ru.lang index 69494c7a..9a572b25 100644 --- a/src/main/resources/assets/ebwizardry/lang/ru_ru.lang +++ b/src/main/resources/assets/ebwizardry/lang/ru_ru.lang @@ -52,22 +52,22 @@ tile.ebwizardry\:dark_oak_lectern.name=Кафедра из тёмного дуб tile.ebwizardry\:receptacle.name=Вместилище tile.ebwizardry\:imbuement_altar.name=Алтарь наполнения -item.ebwizardry\:crystal_magic.name=Волшебный кристалл -item.ebwizardry\:crystal_magic.desc=Переливающиеся цвета этого кристалла, кажется, медленно меняются и кружатся, намекая на волшебную энергию внутри. Возможно, эту магию можно задействовать, как-нибудь... -item.ebwizardry\:crystal_fire.name=Огненный кристалл -item.ebwizardry\:crystal_fire.desc=Кристалл, который светится оранжево-огненным цветом. Возможно, он - ключ к разблокировки элемента огня... -item.ebwizardry\:crystal_ice.name=Ледяной кристалл -item.ebwizardry\:crystal_ice.desc=Кристалл с холодным, синим оттенком. Вероятно, он хранит в себе тайны силы мороза... -item.ebwizardry\:crystal_lightning.name=Грозовой кристалл -item.ebwizardry\:crystal_lightning.desc=Кристалл, который, кажется, вращается и вспыхивает с хаотической энергией. Может быть, он скрывает большую силу внутри... -item.ebwizardry\:crystal_necromancy.name=Тёмный кристалл -item.ebwizardry\:crystal_necromancy.desc=Кристалл с глубоким, пурпурным внешним видом, который, по-видимому, привлекает Вас. Вероятно, это врата к чему-то более тёмному... -item.ebwizardry\:crystal_earth.name=Зелёный кристалл -item.ebwizardry\:crystal_earth.desc=Узорчатый кристалл, со множеством оттенками зелёного и коричневого. Возможно, он держит связь с силами природы... -item.ebwizardry\:crystal_sorcery.name=Мистический кристалл -item.ebwizardry\:crystal_sorcery.desc=Кристалл, который мерцает голубовато-зелёным светом. Возможно, он таит в себе тайны древней силы... -item.ebwizardry\:crystal_healing.name=Сияющий кристалл -item.ebwizardry\:crystal_healing.desc=Кристалл, который блестит золотистым жёлтым светом в дневном свете. Наверное, он владеет связь с божественной силой... +item.ebwizardry\:magic_crystal.name=Волшебный кристалл +item.ebwizardry\:magic_crystal.desc=Переливающиеся цвета этого кристалла, кажется, медленно меняются и кружатся, намекая на волшебную энергию внутри. Возможно, эту магию можно задействовать, как-нибудь... +item.ebwizardry\:fire_crystal.name=Огненный кристалл +item.ebwizardry\:fire_crystal.desc=Кристалл, который светится оранжево-огненным цветом. Возможно, он - ключ к разблокировки элемента огня... +item.ebwizardry\:ice_crystal.name=Ледяной кристалл +item.ebwizardry\:ice_crystal.desc=Кристалл с холодным, синим оттенком. Вероятно, он хранит в себе тайны силы мороза... +item.ebwizardry\:lightning_crystal.name=Грозовой кристалл +item.ebwizardry\:lightning_crystal.desc=Кристалл, который, кажется, вращается и вспыхивает с хаотической энергией. Может быть, он скрывает большую силу внутри... +item.ebwizardry\:necromancy_crystal.name=Тёмный кристалл +item.ebwizardry\:necromancy_crystal.desc=Кристалл с глубоким, пурпурным внешним видом, который, по-видимому, привлекает Вас. Вероятно, это врата к чему-то более тёмному... +item.ebwizardry\:earth_crystal.name=Зелёный кристалл +item.ebwizardry\:earth_crystal.desc=Узорчатый кристалл, со множеством оттенками зелёного и коричневого. Возможно, он держит связь с силами природы... +item.ebwizardry\:sorcery_crystal.name=Мистический кристалл +item.ebwizardry\:sorcery_crystal.desc=Кристалл, который мерцает голубовато-зелёным светом. Возможно, он таит в себе тайны древней силы... +item.ebwizardry\:healing_crystal.name=Сияющий кристалл +item.ebwizardry\:healing_crystal.desc=Кристалл, который блестит золотистым жёлтым светом в дневном свете. Наверное, он владеет связь с божественной силой... item.ebwizardry\:spell_book.name=Книга с заклинанием item.ebwizardry\:spell_book.desc=Книга наполненная рунами и символами древней рукописи. Возможно, с самоотверженностью можно расшифровать её содержание...\n\nНажмите пкм, пока держите эту книгу, чтобы прочитать её. diff --git a/src/main/resources/assets/ebwizardry/lang/zh_cn.lang b/src/main/resources/assets/ebwizardry/lang/zh_cn.lang index 5e8c5c8a..c32ad8c1 100644 --- a/src/main/resources/assets/ebwizardry/lang/zh_cn.lang +++ b/src/main/resources/assets/ebwizardry/lang/zh_cn.lang @@ -52,22 +52,22 @@ tile.ebwizardry\:dark_oak_lectern.name=深色橡木览术台 tile.ebwizardry\:receptacle.name=容杯 tile.ebwizardry\:imbuement_altar.name=注灵祭坛 -item.ebwizardry\:crystal_magic.name=魔力水晶 -item.ebwizardry\:crystal_magic.desc=水晶闪耀斑斓的色彩似乎在缓慢地变幻流转，暗示着其内蕴含的魔法能量。或许能以某种方法来驾驭这种魔力...... -item.ebwizardry\:crystal_fire.name=赤焰水晶 -item.ebwizardry\:crystal_fire.desc=发出烈火般橙色光彩的水晶。也许是揭示火焰元素奥秘的关键...... -item.ebwizardry\:crystal_ice.name=寒霜水晶 -item.ebwizardry\:crystal_ice.desc=具有寒冷的霜蓝色调的水晶。或许它蕴藏着冰霜力量的奥秘...... -item.ebwizardry\:crystal_lightning.name=风暴水晶 -item.ebwizardry\:crystal_lightning.desc=似乎有混沌能量在其中流转闪烁的水晶。也许它内部蕴藏着更强大的力量...... -item.ebwizardry\:crystal_necromancy.name=邃暗水晶 -item.ebwizardry\:crystal_necromancy.desc=暗紫色外观的水晶，凝视它时仿佛被吸入其中。或许它是通往邃暗的门户...... -item.ebwizardry\:crystal_earth.name=苍翠水晶 -item.ebwizardry\:crystal_earth.desc=遍布翠绿与褐色图案的水晶。或许它蕴含着与自然之力的联系...... -item.ebwizardry\:crystal_sorcery.name=秘源水晶 -item.ebwizardry\:crystal_sorcery.desc=散发着碧绿微光的水晶。也许它封存着远古之力的奥秘...... -item.ebwizardry\:crystal_healing.name=光辉水晶 -item.ebwizardry\:crystal_healing.desc=在日光下闪耀金黄色光芒的水晶。或许它连结着神圣之力...... +item.ebwizardry\:magic_crystal.name=魔力水晶 +item.ebwizardry\:magic_crystal.desc=水晶闪耀斑斓的色彩似乎在缓慢地变幻流转，暗示着其内蕴含的魔法能量。或许能以某种方法来驾驭这种魔力...... +item.ebwizardry\:fire_crystal.name=赤焰水晶 +item.ebwizardry\:fire_crystal.desc=发出烈火般橙色光彩的水晶。也许是揭示火焰元素奥秘的关键...... +item.ebwizardry\:ice_crystal.name=寒霜水晶 +item.ebwizardry\:ice_crystal.desc=具有寒冷的霜蓝色调的水晶。或许它蕴藏着冰霜力量的奥秘...... +item.ebwizardry\:lightning_crystal.name=风暴水晶 +item.ebwizardry\:lightning_crystal.desc=似乎有混沌能量在其中流转闪烁的水晶。也许它内部蕴藏着更强大的力量...... +item.ebwizardry\:necromancy_crystal.name=邃暗水晶 +item.ebwizardry\:necromancy_crystal.desc=暗紫色外观的水晶，凝视它时仿佛被吸入其中。或许它是通往邃暗的门户...... +item.ebwizardry\:earth_crystal.name=苍翠水晶 +item.ebwizardry\:earth_crystal.desc=遍布翠绿与褐色图案的水晶。或许它蕴含着与自然之力的联系...... +item.ebwizardry\:sorcery_crystal.name=秘源水晶 +item.ebwizardry\:sorcery_crystal.desc=散发着碧绿微光的水晶。也许它封存着远古之力的奥秘...... +item.ebwizardry\:healing_crystal.name=光辉水晶 +item.ebwizardry\:healing_crystal.desc=在日光下闪耀金黄色光芒的水晶。或许它连结着神圣之力...... item.ebwizardry\:spell_book.name=法术书 item.ebwizardry\:spell_book.desc=一本写满了远古文稿里符号与雕文的书。通过刻苦钻研，或许能破译它的内容......\n\n手持这本书时右击即可阅读。 diff --git a/src/main/resources/assets/ebwizardry/lang/zh_tw.lang b/src/main/resources/assets/ebwizardry/lang/zh_tw.lang index ab0b14e9..59873014 100644 --- a/src/main/resources/assets/ebwizardry/lang/zh_tw.lang +++ b/src/main/resources/assets/ebwizardry/lang/zh_tw.lang @@ -26,14 +26,14 @@ tile.ebwizardry\:earth_crystal_block.name=碧綠水晶方塊 tile.ebwizardry\:sorcery_crystal_block.name=神秘水晶方塊 tile.ebwizardry\:healing_crystal_block.name=聖光水晶方塊 -item.ebwizardry\:crystal_magic.name=魔法水晶 -item.ebwizardry\:crystal_fire.name=火焰水晶 -item.ebwizardry\:crystal_ice.name=寒冰水晶 -item.ebwizardry\:crystal_lightning.name=雷電水晶 -item.ebwizardry\:crystal_necromancy.name=黑暗水晶 -item.ebwizardry\:crystal_earth.name=碧綠水晶 -item.ebwizardry\:crystal_sorcery.name=神秘水晶 -item.ebwizardry\:crystal_healing.name=聖光水晶 +item.ebwizardry\:magic_crystal.name=魔法水晶 +item.ebwizardry\:fire_crystal.name=火焰水晶 +item.ebwizardry\:ice_crystal.name=寒冰水晶 +item.ebwizardry\:lightning_crystal.name=雷電水晶 +item.ebwizardry\:necromancy_crystal.name=黑暗水晶 +item.ebwizardry\:earth_crystal.name=碧綠水晶 +item.ebwizardry\:sorcery_crystal.name=神秘水晶 +item.ebwizardry\:healing_crystal.name=聖光水晶 item.ebwizardry\:magic_wand.name=基礎法杖 item.ebwizardry\:apprentice_wand.name=學徒法杖 diff --git a/src/main/resources/assets/ebwizardry/loot_tables/subsets/elemental_crystals.json b/src/main/resources/assets/ebwizardry/loot_tables/subsets/elemental_crystals.json index 0ee9f1ae..374fec73 100644 --- a/src/main/resources/assets/ebwizardry/loot_tables/subsets/elemental_crystals.json +++ b/src/main/resources/assets/ebwizardry/loot_tables/subsets/elemental_crystals.json @@ -6,37 +6,37 @@ "entries": [ { "type": "item", - "name": "ebwizardry:crystal_earth", + "name": "ebwizardry:earth_crystal", "weight": 1 }, { "type": "item", - "name": "ebwizardry:crystal_fire", + "name": "ebwizardry:fire_crystal", "weight": 1 }, { "type": "item", - "name": "ebwizardry:crystal_healing", + "name": "ebwizardry:healing_crystal", "weight": 1 }, { "type": "item", - "name": "ebwizardry:crystal_ice", + "name": "ebwizardry:ice_crystal", "weight": 1 }, { "type": "item", - "name": "ebwizardry:crystal_lightning", + "name": "ebwizardry:lightning_crystal", "weight": 1 }, { "type": "item", - "name": "ebwizardry:crystal_necromancy", + "name": "ebwizardry:necromancy_crystal", "weight": 1 }, { "type": "item", - "name": "ebwizardry:crystal_sorcery", + "name": "ebwizardry:sorcery_crystal", "weight": 1 } ] diff --git a/src/main/resources/assets/ebwizardry/models/block/magic_crystal_block.json b/src/main/resources/assets/ebwizardry/models/block/magic_crystal_block.json index eda13441..d065c44a 100644 --- a/src/main/resources/assets/ebwizardry/models/block/magic_crystal_block.json +++ b/src/main/resources/assets/ebwizardry/models/block/magic_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "ebwizardry:blocks/crystal_block" + "all": "ebwizardry:blocks/magic_crystal_block" } } diff --git a/src/main/resources/assets/ebwizardry/models/item/crystal_lightning.json b/src/main/resources/assets/ebwizardry/models/item/crystal_lightning.json deleted file mode 100644 index 1c09de74..00000000 --- a/src/main/resources/assets/ebwizardry/models/item/crystal_lightning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "ebwizardry:items/crystal_lightning" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/crystal_necromancy.json b/src/main/resources/assets/ebwizardry/models/item/crystal_necromancy.json deleted file mode 100644 index bd3310a9..00000000 --- a/src/main/resources/assets/ebwizardry/models/item/crystal_necromancy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "ebwizardry:items/crystal_necromancy" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/crystal_sorcery.json b/src/main/resources/assets/ebwizardry/models/item/crystal_sorcery.json deleted file mode 100644 index 0291367b..00000000 --- a/src/main/resources/assets/ebwizardry/models/item/crystal_sorcery.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "ebwizardry:items/crystal_sorcery" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/crystal_earth.json b/src/main/resources/assets/ebwizardry/models/item/earth_crystal.json similarity index 53% rename from src/main/resources/assets/ebwizardry/models/item/crystal_earth.json rename to src/main/resources/assets/ebwizardry/models/item/earth_crystal.json index 723d42e0..2c454202 100644 --- a/src/main/resources/assets/ebwizardry/models/item/crystal_earth.json +++ b/src/main/resources/assets/ebwizardry/models/item/earth_crystal.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ebwizardry:items/crystal_earth" + "layer0": "ebwizardry:items/earth_crystal" } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/crystal_fire.json b/src/main/resources/assets/ebwizardry/models/item/fire_crystal.json similarity index 54% rename from src/main/resources/assets/ebwizardry/models/item/crystal_fire.json rename to src/main/resources/assets/ebwizardry/models/item/fire_crystal.json index 573dfe03..ec4eb5af 100644 --- a/src/main/resources/assets/ebwizardry/models/item/crystal_fire.json +++ b/src/main/resources/assets/ebwizardry/models/item/fire_crystal.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ebwizardry:items/crystal_fire" + "layer0": "ebwizardry:items/fire_crystal" } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/crystal_healing.json b/src/main/resources/assets/ebwizardry/models/item/healing_crystal.json similarity index 52% rename from src/main/resources/assets/ebwizardry/models/item/crystal_healing.json rename to src/main/resources/assets/ebwizardry/models/item/healing_crystal.json index d91d3939..1f399776 100644 --- a/src/main/resources/assets/ebwizardry/models/item/crystal_healing.json +++ b/src/main/resources/assets/ebwizardry/models/item/healing_crystal.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ebwizardry:items/crystal_healing" + "layer0": "ebwizardry:items/healing_crystal" } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/crystal_ice.json b/src/main/resources/assets/ebwizardry/models/item/ice_crystal.json similarity index 54% rename from src/main/resources/assets/ebwizardry/models/item/crystal_ice.json rename to src/main/resources/assets/ebwizardry/models/item/ice_crystal.json index c879ac46..02dcd22f 100644 --- a/src/main/resources/assets/ebwizardry/models/item/crystal_ice.json +++ b/src/main/resources/assets/ebwizardry/models/item/ice_crystal.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ebwizardry:items/crystal_ice" + "layer0": "ebwizardry:items/ice_crystal" } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/lightning_crystal.json b/src/main/resources/assets/ebwizardry/models/item/lightning_crystal.json new file mode 100644 index 00000000..5e13e0f3 --- /dev/null +++ b/src/main/resources/assets/ebwizardry/models/item/lightning_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ebwizardry:items/lightning_crystal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/crystal_magic.json b/src/main/resources/assets/ebwizardry/models/item/magic_crystal.json similarity index 53% rename from src/main/resources/assets/ebwizardry/models/item/crystal_magic.json rename to src/main/resources/assets/ebwizardry/models/item/magic_crystal.json index 23f6c4c2..9e2e4903 100644 --- a/src/main/resources/assets/ebwizardry/models/item/crystal_magic.json +++ b/src/main/resources/assets/ebwizardry/models/item/magic_crystal.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ebwizardry:items/crystal_magic" + "layer0": "ebwizardry:items/magic_crystal" } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/necromancy_crystal.json b/src/main/resources/assets/ebwizardry/models/item/necromancy_crystal.json new file mode 100644 index 00000000..af207b45 --- /dev/null +++ b/src/main/resources/assets/ebwizardry/models/item/necromancy_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ebwizardry:items/necromancy_crystal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/sorcery_crystal.json b/src/main/resources/assets/ebwizardry/models/item/sorcery_crystal.json new file mode 100644 index 00000000..f98ca717 --- /dev/null +++ b/src/main/resources/assets/ebwizardry/models/item/sorcery_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ebwizardry:items/sorcery_crystal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_ice.json b/src/main/resources/assets/ebwizardry/recipes/crystal_block_ice.json deleted file mode 100644 index 3e172395..00000000 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_ice.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "zzz", - "zzz", - "zzz" - ], - "key": { - "z": { - "item": "ebwizardry:magic_crystal", - "data": 2 - } - }, - "result": { - "item": "ebwizardry:crystal_block", - "data": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_lightning.json b/src/main/resources/assets/ebwizardry/recipes/crystal_block_lightning.json deleted file mode 100644 index 8f7417fc..00000000 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_lightning.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "zzz", - "zzz", - "zzz" - ], - "key": { - "z": { - "item": "ebwizardry:magic_crystal", - "data": 3 - } - }, - "result": { - "item": "ebwizardry:crystal_block", - "data": 3 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_necromancy.json b/src/main/resources/assets/ebwizardry/recipes/crystal_block_necromancy.json deleted file mode 100644 index 4d76abdc..00000000 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_necromancy.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "zzz", - "zzz", - "zzz" - ], - "key": { - "z": { - "item": "ebwizardry:magic_crystal", - "data": 4 - } - }, - "result": { - "item": "ebwizardry:crystal_block", - "data": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_sorcery.json b/src/main/resources/assets/ebwizardry/recipes/crystal_block_sorcery.json deleted file mode 100644 index 079793ad..00000000 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_sorcery.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "zzz", - "zzz", - "zzz" - ], - "key": { - "z": { - "item": "ebwizardry:magic_crystal", - "data": 6 - } - }, - "result": { - "item": "ebwizardry:crystal_block", - "data": 6 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals.json b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals.json index d2cb4435..0c29b402 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals.json +++ b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals.json @@ -3,13 +3,11 @@ "group": "magic_crystal", "ingredients": [ { - "item": "ebwizardry:crystal_block", - "data": 0 + "item": "ebwizardry:magic_crystal_block" } ], "result": { "item": "ebwizardry:magic_crystal", - "data": 0, "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_earth.json b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_earth.json index 81d77ff9..181e66a3 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_earth.json +++ b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_earth.json @@ -3,13 +3,11 @@ "group": "magic_crystal", "ingredients": [ { - "item": "ebwizardry:crystal_block", - "data": 5 + "item": "ebwizardry:earth_crystal_block" } ], "result": { - "item": "ebwizardry:magic_crystal", - "data": 5, + "item": "ebwizardry:earth_crystal", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_fire.json b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_fire.json index 2760c161..81230300 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_fire.json +++ b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_fire.json @@ -3,13 +3,11 @@ "group": "magic_crystal", "ingredients": [ { - "item": "ebwizardry:crystal_block", - "data": 1 + "item": "ebwizardry:fire_crystal_block" } ], "result": { - "item": "ebwizardry:magic_crystal", - "data": 1, + "item": "ebwizardry:fire_crystal", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_healing.json b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_healing.json index 46f180de..3b7b3173 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_healing.json +++ b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_healing.json @@ -3,13 +3,11 @@ "group": "magic_crystal", "ingredients": [ { - "item": "ebwizardry:crystal_block", - "data": 7 + "item": "ebwizardry:healing_crystal_block" } ], "result": { - "item": "ebwizardry:magic_crystal", - "data": 7, + "item": "ebwizardry:healing_crystal", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_ice.json b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_ice.json index bc34ba01..b5412d5d 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_ice.json +++ b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_ice.json @@ -3,13 +3,11 @@ "group": "magic_crystal", "ingredients": [ { - "item": "ebwizardry:crystal_block", - "data": 2 + "item": "ebwizardry:ice_crystal_block" } ], "result": { - "item": "ebwizardry:magic_crystal", - "data": 2, + "item": "ebwizardry:ice_crystal", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_lightning.json b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_lightning.json index 3bf151c0..6ba57ca6 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_lightning.json +++ b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_lightning.json @@ -3,13 +3,11 @@ "group": "magic_crystal", "ingredients": [ { - "item": "ebwizardry:crystal_block", - "data": 3 + "item": "ebwizardry:lightning_crystal_block" } ], "result": { - "item": "ebwizardry:magic_crystal", - "data": 3, + "item": "ebwizardry:lightning_crystal", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_necromancy.json b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_necromancy.json index 0de3b757..2c9fdad9 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_necromancy.json +++ b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_necromancy.json @@ -3,13 +3,11 @@ "group": "magic_crystal", "ingredients": [ { - "item": "ebwizardry:crystal_block", - "data": 4 + "item": "ebwizardry:necromancy_crystal_block" } ], "result": { - "item": "ebwizardry:magic_crystal", - "data": 4, + "item": "ebwizardry:necromancy_crystal", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_sorcery.json b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_sorcery.json index cde5784c..6f7344f0 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_sorcery.json +++ b/src/main/resources/assets/ebwizardry/recipes/crystal_block_to_crystals_sorcery.json @@ -3,13 +3,11 @@ "group": "magic_crystal", "ingredients": [ { - "item": "ebwizardry:crystal_block", - "data": 6 + "item": "ebwizardry:sorcery_crystal_block" } ], "result": { - "item": "ebwizardry:magic_crystal", - "data": 6, + "item": "ebwizardry:sorcery_crystal", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_flower_to_crystals.json b/src/main/resources/assets/ebwizardry/recipes/crystal_flower_to_crystals.json index 4a86c790..2ba98699 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_flower_to_crystals.json +++ b/src/main/resources/assets/ebwizardry/recipes/crystal_flower_to_crystals.json @@ -8,7 +8,6 @@ ], "result": { "item": "ebwizardry:magic_crystal", - "data": 0, "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_shard.json b/src/main/resources/assets/ebwizardry/recipes/crystal_shard.json index 8055c3cf..4c621b56 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_shard.json +++ b/src/main/resources/assets/ebwizardry/recipes/crystal_shard.json @@ -2,8 +2,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "ebwizardry:magic_crystal", - "data": 0 + "item": "ebwizardry:magic_crystal" } ], "result": { diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block.json b/src/main/resources/assets/ebwizardry/recipes/earth_crystal_block.json similarity index 60% rename from src/main/resources/assets/ebwizardry/recipes/crystal_block.json rename to src/main/resources/assets/ebwizardry/recipes/earth_crystal_block.json index 2bf0ef30..83f82716 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block.json +++ b/src/main/resources/assets/ebwizardry/recipes/earth_crystal_block.json @@ -7,12 +7,10 @@ ], "key": { "z": { - "item": "ebwizardry:magic_crystal", - "data": 0 + "item": "ebwizardry:earth_crystal" } }, "result": { - "item": "ebwizardry:crystal_block", - "data": 0 + "item": "ebwizardry:earth_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_earth.json b/src/main/resources/assets/ebwizardry/recipes/fire_crystal_block.json similarity index 60% rename from src/main/resources/assets/ebwizardry/recipes/crystal_block_earth.json rename to src/main/resources/assets/ebwizardry/recipes/fire_crystal_block.json index c24d9441..14bd58c2 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_earth.json +++ b/src/main/resources/assets/ebwizardry/recipes/fire_crystal_block.json @@ -7,12 +7,10 @@ ], "key": { "z": { - "item": "ebwizardry:magic_crystal", - "data": 5 + "item": "ebwizardry:fire_crystal" } }, "result": { - "item": "ebwizardry:crystal_block", - "data": 5 + "item": "ebwizardry:fire_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_fire.json b/src/main/resources/assets/ebwizardry/recipes/healing_crystal_block.json similarity index 60% rename from src/main/resources/assets/ebwizardry/recipes/crystal_block_fire.json rename to src/main/resources/assets/ebwizardry/recipes/healing_crystal_block.json index fbb0b15a..12e67157 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_fire.json +++ b/src/main/resources/assets/ebwizardry/recipes/healing_crystal_block.json @@ -7,12 +7,10 @@ ], "key": { "z": { - "item": "ebwizardry:magic_crystal", - "data": 1 + "item": "ebwizardry:healing_crystal" } }, "result": { - "item": "ebwizardry:crystal_block", - "data": 1 + "item": "ebwizardry:healing_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/crystal_block_healing.json b/src/main/resources/assets/ebwizardry/recipes/ice_crystal_block.json similarity index 60% rename from src/main/resources/assets/ebwizardry/recipes/crystal_block_healing.json rename to src/main/resources/assets/ebwizardry/recipes/ice_crystal_block.json index 2cf4e092..1d063259 100644 --- a/src/main/resources/assets/ebwizardry/recipes/crystal_block_healing.json +++ b/src/main/resources/assets/ebwizardry/recipes/ice_crystal_block.json @@ -7,12 +7,10 @@ ], "key": { "z": { - "item": "ebwizardry:magic_crystal", - "data": 7 + "item": "ebwizardry:ice_crystal" } }, "result": { - "item": "ebwizardry:crystal_block", - "data": 7 + "item": "ebwizardry:ice_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/lightning_crystal_block.json b/src/main/resources/assets/ebwizardry/recipes/lightning_crystal_block.json new file mode 100644 index 00000000..b00fec5b --- /dev/null +++ b/src/main/resources/assets/ebwizardry/recipes/lightning_crystal_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "zzz", + "zzz", + "zzz" + ], + "key": { + "z": { + "item": "ebwizardry:lightning_crystal" + } + }, + "result": { + "item": "ebwizardry:lightning_crystal_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/magic_crystal_block.json b/src/main/resources/assets/ebwizardry/recipes/magic_crystal_block.json new file mode 100644 index 00000000..523635b7 --- /dev/null +++ b/src/main/resources/assets/ebwizardry/recipes/magic_crystal_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "zzz", + "zzz", + "zzz" + ], + "key": { + "z": { + "item": "ebwizardry:magic_crystal" + } + }, + "result": { + "item": "ebwizardry:magic_crystal_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/necromancy_crystal_block.json b/src/main/resources/assets/ebwizardry/recipes/necromancy_crystal_block.json new file mode 100644 index 00000000..c0b31426 --- /dev/null +++ b/src/main/resources/assets/ebwizardry/recipes/necromancy_crystal_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "zzz", + "zzz", + "zzz" + ], + "key": { + "z": { + "item": "ebwizardry:necromancy_crystal" + } + }, + "result": { + "item": "ebwizardry:necromancy_crystal_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/recipes/sorcery_crystal_block.json b/src/main/resources/assets/ebwizardry/recipes/sorcery_crystal_block.json new file mode 100644 index 00000000..13cc9818 --- /dev/null +++ b/src/main/resources/assets/ebwizardry/recipes/sorcery_crystal_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "zzz", + "zzz", + "zzz" + ], + "key": { + "z": { + "item": "ebwizardry:sorcery_crystal" + } + }, + "result": { + "item": "ebwizardry:sorcery_crystal_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json b/src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json index 635cadd2..5593bf82 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json @@ -27,7 +27,7 @@ "height": 64 }, "magic_crystal": { - "location": "ebwizardry:textures/items/crystal_magic.png", + "location": "ebwizardry:textures/items/magic_crystal.png", "caption": "A Magic Crystal", "u": 6, "v": 6, @@ -161,14 +161,14 @@ }, "crystal_blocks": { "locations": [ - "ebwizardry:crystal_block", - "ebwizardry:crystal_block_fire", - "ebwizardry:crystal_block_ice", - "ebwizardry:crystal_block_lightning", - "ebwizardry:crystal_block_necromancy", - "ebwizardry:crystal_block_earth", - "ebwizardry:crystal_block_sorcery", - "ebwizardry:crystal_block_healing" + "ebwizardry:magic_crystal_block", + "ebwizardry:fire_crystal_block", + "ebwizardry:ice_crystal_block", + "ebwizardry:lightning_crystal_block", + "ebwizardry:necromancy_crystal_block", + "ebwizardry:earth_crystal_block", + "ebwizardry:sorcery_crystal_block", + "ebwizardry:healing_crystal_block" ] }, "crystal_blocks_to_crystals": { diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_en_us.json b/src/main/resources/assets/ebwizardry/texts/handbook_en_us.json index cb141a87..ab5cbdee 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_en_us.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_en_us.json @@ -27,7 +27,7 @@ "height": 64 }, "magic_crystal": { - "location": "ebwizardry:textures/items/crystal_magic.png", + "location": "ebwizardry:textures/items/magic_crystal.png", "caption": "A Magic Crystal", "u": 6, "v": 6, @@ -161,14 +161,14 @@ }, "crystal_blocks": { "locations": [ - "ebwizardry:crystal_block", - "ebwizardry:crystal_block_fire", - "ebwizardry:crystal_block_ice", - "ebwizardry:crystal_block_lightning", - "ebwizardry:crystal_block_necromancy", - "ebwizardry:crystal_block_earth", - "ebwizardry:crystal_block_sorcery", - "ebwizardry:crystal_block_healing" + "ebwizardry:magic_crystal_block", + "ebwizardry:fire_crystal_block", + "ebwizardry:ice_crystal_block", + "ebwizardry:lightning_crystal_block", + "ebwizardry:necromancy_crystal_block", + "ebwizardry:earth_crystal_block", + "ebwizardry:sorcery_crystal_block", + "ebwizardry:healing_crystal_block" ] }, "crystal_blocks_to_crystals": { diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_es_es.json b/src/main/resources/assets/ebwizardry/texts/handbook_es_es.json index fc356077..265becc7 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_es_es.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_es_es.json @@ -27,7 +27,7 @@ "height": 64 }, "magic_crystal": { - "location": "ebwizardry:textures/items/crystal_magic.png", + "location": "ebwizardry:textures/items/magic_crystal.png", "caption": "Cristal Magico", "u": 6, "v": 6, @@ -152,14 +152,14 @@ }, "crystal_blocks": { "locations": [ - "ebwizardry:crystal_block", - "ebwizardry:crystal_block_fire", - "ebwizardry:crystal_block_ice", - "ebwizardry:crystal_block_lightning", - "ebwizardry:crystal_block_necromancy", - "ebwizardry:crystal_block_earth", - "ebwizardry:crystal_block_sorcery", - "ebwizardry:crystal_block_healing" + "ebwizardry:magic_crystal_block", + "ebwizardry:fire_crystal_block", + "ebwizardry:ice_crystal_block", + "ebwizardry:lightning_crystal_block", + "ebwizardry:necromancy_crystal_block", + "ebwizardry:earth_crystal_block", + "ebwizardry:sorcery_crystal_block", + "ebwizardry:healing_crystal_block" ] }, "crystal_blocks_to_crystals": { diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_hu_hu.json b/src/main/resources/assets/ebwizardry/texts/handbook_hu_hu.json index f358d1cc..8a202429 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_hu_hu.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_hu_hu.json @@ -27,7 +27,7 @@ "height": 64 }, "magic_crystal": { - "location": "ebwizardry:textures/items/crystal_magic.png", + "location": "ebwizardry:textures/items/magic_crystal.png", "caption": "Egy Varázskristály", "u": 6, "v": 6, diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_ko_kr.json b/src/main/resources/assets/ebwizardry/texts/handbook_ko_kr.json index 6b13db92..5cbc5204 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_ko_kr.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_ko_kr.json @@ -27,7 +27,7 @@ "height": 64 }, "magic_crystal": { - "location": "ebwizardry:textures/items/crystal_magic.png", + "location": "ebwizardry:textures/items/magic_crystal.png", "caption": "마법수정", "u": 6, "v": 6, diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_pl_pl.json b/src/main/resources/assets/ebwizardry/texts/handbook_pl_pl.json index e22fe841..f5d5dc0d 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_pl_pl.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_pl_pl.json @@ -27,7 +27,7 @@ "height": 64 }, "magic_crystal": { - "location": "ebwizardry:textures/items/crystal_magic.png", + "location": "ebwizardry:textures/items/magic_crystal.png", "caption": "Magiczny Kryształl", "u": 6, "v": 6, diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_ru_ru.json b/src/main/resources/assets/ebwizardry/texts/handbook_ru_ru.json index 467d3ce8..91a2e18e 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_ru_ru.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_ru_ru.json @@ -27,7 +27,7 @@ "height": 64 }, "magic_crystal": { - "location": "ebwizardry:textures/items/crystal_magic.png", + "location": "ebwizardry:textures/items/magic_crystal.png", "caption": "Волшебный кристалл", "u": 6, "v": 6, @@ -161,14 +161,14 @@ }, "crystal_blocks": { "locations": [ - "ebwizardry:crystal_block", - "ebwizardry:crystal_block_fire", - "ebwizardry:crystal_block_ice", - "ebwizardry:crystal_block_lightning", - "ebwizardry:crystal_block_necromancy", - "ebwizardry:crystal_block_earth", - "ebwizardry:crystal_block_sorcery", - "ebwizardry:crystal_block_healing" + "ebwizardry:magic_crystal_block", + "ebwizardry:fire_crystal_block", + "ebwizardry:ice_crystal_block", + "ebwizardry:lightning_crystal_block", + "ebwizardry:necromancy_crystal_block", + "ebwizardry:earth_crystal_block", + "ebwizardry:sorcery_crystal_block", + "ebwizardry:healing_crystal_block" ] }, "crystal_blocks_to_crystals": { diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_zh_cn.json b/src/main/resources/assets/ebwizardry/texts/handbook_zh_cn.json index c75c4f1d..dfccc452 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_zh_cn.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_zh_cn.json @@ -27,7 +27,7 @@ "height": 64 }, "magic_crystal": { - "location": "ebwizardry:textures/items/crystal_magic.png", + "location": "ebwizardry:textures/items/magic_crystal.png", "caption": "魔力水晶", "u": 6, "v": 6, diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_zh_tw.json b/src/main/resources/assets/ebwizardry/texts/handbook_zh_tw.json index f2793668..ee864891 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_zh_tw.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_zh_tw.json @@ -27,7 +27,7 @@ "height": 64 }, "magic_crystal": { - "location": "ebwizardry:textures/items/crystal_magic.png", + "location": "ebwizardry:textures/items/magic_crystal.png", "caption": "魔法水晶", "u": 6, "v": 6, @@ -152,14 +152,14 @@ }, "crystal_blocks": { "locations": [ - "ebwizardry:crystal_block", - "ebwizardry:crystal_block_fire", - "ebwizardry:crystal_block_ice", - "ebwizardry:crystal_block_lightning", - "ebwizardry:crystal_block_necromancy", - "ebwizardry:crystal_block_earth", - "ebwizardry:crystal_block_sorcery", - "ebwizardry:crystal_block_healing" + "ebwizardry:magic_crystal_block", + "ebwizardry:fire_crystal_block", + "ebwizardry:ice_crystal_block", + "ebwizardry:lightning_crystal_block", + "ebwizardry:necromancy_crystal_block", + "ebwizardry:earth_crystal_block", + "ebwizardry:sorcery_crystal_block", + "ebwizardry:healing_crystal_block" ] }, "crystal_blocks_to_crystals": { diff --git a/src/main/resources/assets/ebwizardry/textures/blocks/crystal_block.png b/src/main/resources/assets/ebwizardry/textures/blocks/magic_crystal_block.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/blocks/crystal_block.png rename to src/main/resources/assets/ebwizardry/textures/blocks/magic_crystal_block.png diff --git a/src/main/resources/assets/ebwizardry/textures/items/crystal_earth.png b/src/main/resources/assets/ebwizardry/textures/items/earth_crystal.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/items/crystal_earth.png rename to src/main/resources/assets/ebwizardry/textures/items/earth_crystal.png diff --git a/src/main/resources/assets/ebwizardry/textures/items/crystal_fire.png b/src/main/resources/assets/ebwizardry/textures/items/fire_crystal.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/items/crystal_fire.png rename to src/main/resources/assets/ebwizardry/textures/items/fire_crystal.png diff --git a/src/main/resources/assets/ebwizardry/textures/items/crystal_healing.png b/src/main/resources/assets/ebwizardry/textures/items/healing_crystal.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/items/crystal_healing.png rename to src/main/resources/assets/ebwizardry/textures/items/healing_crystal.png diff --git a/src/main/resources/assets/ebwizardry/textures/items/crystal_ice.png b/src/main/resources/assets/ebwizardry/textures/items/ice_crystal.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/items/crystal_ice.png rename to src/main/resources/assets/ebwizardry/textures/items/ice_crystal.png diff --git a/src/main/resources/assets/ebwizardry/textures/items/crystal_lightning.png b/src/main/resources/assets/ebwizardry/textures/items/lightning_crystal.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/items/crystal_lightning.png rename to src/main/resources/assets/ebwizardry/textures/items/lightning_crystal.png diff --git a/src/main/resources/assets/ebwizardry/textures/items/crystal_magic.png b/src/main/resources/assets/ebwizardry/textures/items/magic_crystal.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/items/crystal_magic.png rename to src/main/resources/assets/ebwizardry/textures/items/magic_crystal.png diff --git a/src/main/resources/assets/ebwizardry/textures/items/crystal_necromancy.png b/src/main/resources/assets/ebwizardry/textures/items/necromancy_crystal.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/items/crystal_necromancy.png rename to src/main/resources/assets/ebwizardry/textures/items/necromancy_crystal.png diff --git a/src/main/resources/assets/ebwizardry/textures/items/crystal_sorcery.png b/src/main/resources/assets/ebwizardry/textures/items/sorcery_crystal.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/items/crystal_sorcery.png rename to src/main/resources/assets/ebwizardry/textures/items/sorcery_crystal.png