diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index a3184496..80b2cf1f 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -60,13 +60,14 @@ public class RegistrarBloodMagic { @SubscribeEvent public static void registerBloodOrbs(RegistryEvent.Register event) { + ResourceLocation orb = RegistrarBloodMagicItems.BLOOD_ORB.getRegistryName(); event.getRegistry().registerAll( - new BloodOrb("weak", 1, 5000).setRegistryName("weak"), - new BloodOrb("apprentice", 2, 25000).setRegistryName("apprentice"), - new BloodOrb("magician", 3, 150000).setRegistryName("magician"), - new BloodOrb("master", 4, 1000000).setRegistryName("master"), - new BloodOrb("archmage", 5, 10000000).setRegistryName("archmage"), - new BloodOrb("transcendent", 6, 30000000).setRegistryName("transcendent") + new BloodOrb("weak", 1, 5000).withModel(new ModelResourceLocation(orb, "type=weak")).setRegistryName("weak"), + new BloodOrb("apprentice", 2, 25000).withModel(new ModelResourceLocation(orb, "type=apprentice")).setRegistryName("apprentice"), + new BloodOrb("magician", 3, 150000).withModel(new ModelResourceLocation(orb, "type=magician")).setRegistryName("magician"), + new BloodOrb("master", 4, 1000000).withModel(new ModelResourceLocation(orb, "type=master")).setRegistryName("master"), + new BloodOrb("archmage", 5, 10000000).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage"), + new BloodOrb("transcendent", 6, 30000000).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") ); } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java index 58e11bc8..82f61820 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java @@ -8,7 +8,7 @@ import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode; import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode; import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode; -import com.google.common.collect.Sets; +import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -18,7 +18,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import java.util.Set; +import java.util.List; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) @@ -66,14 +66,14 @@ public class RegistrarBloodMagicBlocks { public static final Block INVERSION_PILLAR = Blocks.AIR; public static final Block INVERSION_PILLAR_END = Blocks.AIR; - static Set blocks; + static List blocks; @SubscribeEvent public static void registerBlocks(RegistryEvent.Register event) { FluidRegistry.registerFluid(BlockLifeEssence.getLifeEssence()); FluidRegistry.addBucketForFluid(BlockLifeEssence.getLifeEssence()); - blocks = Sets.newHashSet( + blocks = Lists.newArrayList( new BlockAltar().setRegistryName("altar"), new BlockBloodRune().setRegistryName("blood_rune"), new BlockRitualController().setRegistryName("ritual_controller"), diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 3ce61755..0bbcea86 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -74,7 +74,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { @Override public void getSubItems(CreativeTabs tab, NonNullList subItems) { - if (isInCreativeTab(tab)) + if (!isInCreativeTab(tab)) return; subItems.add(Utils.setUnbreakable(new ItemStack(this))); diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java index 81a701a3..0e8bb21d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java @@ -61,9 +61,10 @@ public class ItemBlockBloodTank extends ItemBlock { @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs creativeTab, NonNullList list) { if (!isInCreativeTab(creativeTab)) + return; - for (int i = 0; i < TileBloodTank.CAPACITIES.length; i++) - list.add(new ItemStack(this, 1, i)); + for (int i = 0; i < TileBloodTank.CAPACITIES.length; i++) + list.add(new ItemStack(this, 1, i)); } public int getCapacity(ItemStack container) { diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemactivationcrystal.json b/src/main/resources/assets/bloodmagic/blockstates/activation_crystal.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemactivationcrystal.json rename to src/main/resources/assets/bloodmagic/blockstates/activation_crystal.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockalchemyarray.json b/src/main/resources/assets/bloodmagic/blockstates/alchemy_array.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockalchemyarray.json rename to src/main/resources/assets/bloodmagic/blockstates/alchemy_array.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockalchemytable.json b/src/main/resources/assets/bloodmagic/blockstates/alchemy_table.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockalchemytable.json rename to src/main/resources/assets/bloodmagic/blockstates/alchemy_table.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockaltar.json b/src/main/resources/assets/bloodmagic/blockstates/altar.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockaltar.json rename to src/main/resources/assets/bloodmagic/blockstates/altar.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemaltarmaker.json b/src/main/resources/assets/bloodmagic/blockstates/altar_maker.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemaltarmaker.json rename to src/main/resources/assets/bloodmagic/blockstates/altar_maker.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemarcaneashes.json b/src/main/resources/assets/bloodmagic/blockstates/arcane_ashes.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemarcaneashes.json rename to src/main/resources/assets/bloodmagic/blockstates/arcane_ashes.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemfluidrouterfilter.json b/src/main/resources/assets/bloodmagic/blockstates/base_fluid_filter.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemfluidrouterfilter.json rename to src/main/resources/assets/bloodmagic/blockstates/base_fluid_filter.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemrouterfilter.json b/src/main/resources/assets/bloodmagic/blockstates/base_item_filter.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemrouterfilter.json rename to src/main/resources/assets/bloodmagic/blockstates/base_item_filter.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockcrystal.json b/src/main/resources/assets/bloodmagic/blockstates/blockcrystal.json deleted file mode 100644 index c997259c..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/blockcrystal.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { }, - "model": "cube_all", - "uvlock": true - }, - "variants": { - "type": { - "large": { - "textures": { - "all": "bloodmagic:blocks/ShardCluster" - } - }, - "brick": { - "textures": { - "all": "bloodmagic:blocks/ShardClusterBrick" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockbloodlight.json b/src/main/resources/assets/bloodmagic/blockstates/blood_light.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockbloodlight.json rename to src/main/resources/assets/bloodmagic/blockstates/blood_light.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_orb.json b/src/main/resources/assets/bloodmagic/blockstates/blood_orb.json new file mode 100644 index 00000000..a5c42df5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_orb.json @@ -0,0 +1,41 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "type": { + "weak": { + "textures": { + "layer0": "bloodmagic:items/weakbloodorb" + } + }, + "apprentice": { + "textures": { + "layer0": "bloodmagic:items/apprenticebloodorb" + } + }, + "magician": { + "textures": { + "layer0": "bloodmagic:items/magicianbloodorb" + } + }, + "master": { + "textures": { + "layer0": "bloodmagic:items/masterbloodorb" + } + }, + "archmage": { + "textures": { + "layer0": "bloodmagic:items/archmagebloodorb" + } + }, + "transcendent": { + "textures": { + "layer0": "bloodmagic:items/transcendentbloodorb" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockbloodrune.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockbloodrune.json rename to src/main/resources/assets/bloodmagic/blockstates/blood_rune.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itembloodshard.json b/src/main/resources/assets/bloodmagic/blockstates/blood_shard.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itembloodshard.json rename to src/main/resources/assets/bloodmagic/blockstates/blood_shard.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockbloodtank.json b/src/main/resources/assets/bloodmagic/blockstates/blood_tank.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockbloodtank.json rename to src/main/resources/assets/bloodmagic/blockstates/blood_tank.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemboundaxe.json b/src/main/resources/assets/bloodmagic/blockstates/bound_axe.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemboundaxe.json rename to src/main/resources/assets/bloodmagic/blockstates/bound_axe.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemboundpickaxe.json b/src/main/resources/assets/bloodmagic/blockstates/bound_pickaxe.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemboundpickaxe.json rename to src/main/resources/assets/bloodmagic/blockstates/bound_pickaxe.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemboundshovel.json b/src/main/resources/assets/bloodmagic/blockstates/bound_shovel.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemboundshovel.json rename to src/main/resources/assets/bloodmagic/blockstates/bound_shovel.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemboundsword.json b/src/main/resources/assets/bloodmagic/blockstates/bound_sword.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemboundsword.json rename to src/main/resources/assets/bloodmagic/blockstates/bound_sword.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemcomponent.json b/src/main/resources/assets/bloodmagic/blockstates/component.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemcomponent.json rename to src/main/resources/assets/bloodmagic/blockstates/component.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemcuttingfluid.json b/src/main/resources/assets/bloodmagic/blockstates/cutting_fluid.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemcuttingfluid.json rename to src/main/resources/assets/bloodmagic/blockstates/cutting_fluid.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemdaggerofsacrifice.json b/src/main/resources/assets/bloodmagic/blockstates/dagger_of_sacrifice.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemdaggerofsacrifice.json rename to src/main/resources/assets/bloodmagic/blockstates/dagger_of_sacrifice.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockbloodstonebrick.json b/src/main/resources/assets/bloodmagic/blockstates/decorative_brick.json similarity index 54% rename from src/main/resources/assets/bloodmagic/blockstates/blockbloodstonebrick.json rename to src/main/resources/assets/bloodmagic/blockstates/decorative_brick.json index 9cce5ef3..00970ac6 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/blockbloodstonebrick.json +++ b/src/main/resources/assets/bloodmagic/blockstates/decorative_brick.json @@ -7,15 +7,25 @@ }, "variants": { "type": { - "large": { + "bloodstone_tile": { "textures": { "all": "bloodmagic:blocks/LargeBloodStoneBrick" } }, - "brick": { + "bloodstone_brick": { "textures": { "all": "bloodmagic:blocks/BloodStoneBrick" } + }, + "crystal_tile": { + "textures": { + "all": "bloodmagic:blocks/shardcluster" + } + }, + "crystal_brick": { + "textures": { + "all": "bloodmagic:blocks/shardclusterbrick" + } } } } diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockdemonbricks1.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_1.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockdemonbricks1.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_brick_1.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockdemonbricks2.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_2.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockdemonbricks2.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_brick_2.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockdemoncrucible.json b/src/main/resources/assets/bloodmagic/blockstates/demon_crucible.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockdemoncrucible.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_crucible.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockdemoncrystal.json b/src/main/resources/assets/bloodmagic/blockstates/demon_crystal.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockdemoncrystal.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_crystal.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockdemoncrystallizer.json b/src/main/resources/assets/bloodmagic/blockstates/demon_crystallizer.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockdemoncrystallizer.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_crystallizer.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockdemonextra.json b/src/main/resources/assets/bloodmagic/blockstates/demon_extras.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockdemonextra.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_extras.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockdemonlight.json b/src/main/resources/assets/bloodmagic/blockstates/demon_light.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockdemonlight.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_light.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockpillar1.json b/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_1.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockpillar1.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_pillar_1.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockpillar2.json b/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_2.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockpillar2.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_pillar_2.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockpillarcap1.json b/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_1.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockpillarcap1.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_1.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockpillarcap2.json b/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_2.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockpillarcap2.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_2.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockpillarcap3.json b/src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_3.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockpillarcap3.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_pillar_cap_3.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockdemonpylon.json b/src/main/resources/assets/bloodmagic/blockstates/demon_pylon.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockdemonpylon.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_pylon.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockstairs1.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stairs_1.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockstairs1.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_stairs_1.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockstairs2.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stairs_2.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockstairs2.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_stairs_2.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockstairs3.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stairs_3.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockstairs3.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_stairs_3.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockwall1.json b/src/main/resources/assets/bloodmagic/blockstates/demon_wall_1.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockwall1.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_wall_1.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemdemonwillgauge.json b/src/main/resources/assets/bloodmagic/blockstates/demon_will_gauge.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemdemonwillgauge.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_will_gauge.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockdimensionalportal.json b/src/main/resources/assets/bloodmagic/blockstates/dimensional_portal.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockdimensionalportal.json rename to src/main/resources/assets/bloodmagic/blockstates/dimensional_portal.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemexperiencebook.json b/src/main/resources/assets/bloodmagic/blockstates/experience_tome.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemexperiencebook.json rename to src/main/resources/assets/bloodmagic/blockstates/experience_tome.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockincensealtar.json b/src/main/resources/assets/bloodmagic/blockstates/incense_altar.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockincensealtar.json rename to src/main/resources/assets/bloodmagic/blockstates/incense_altar.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockinputroutingnode.json b/src/main/resources/assets/bloodmagic/blockstates/input_routing_node.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockinputroutingnode.json rename to src/main/resources/assets/bloodmagic/blockstates/input_routing_node.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/iteminscriptiontool.json b/src/main/resources/assets/bloodmagic/blockstates/inscription_tool.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/iteminscriptiontool.json rename to src/main/resources/assets/bloodmagic/blockstates/inscription_tool.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockinversionpillar.json b/src/main/resources/assets/bloodmagic/blockstates/inversion_pillar.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockinversionpillar.json rename to src/main/resources/assets/bloodmagic/blockstates/inversion_pillar.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockinversionpillarend.json b/src/main/resources/assets/bloodmagic/blockstates/inversion_pillar_end.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockinversionpillarend.json rename to src/main/resources/assets/bloodmagic/blockstates/inversion_pillar_end.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemblockdemoncrystal.json b/src/main/resources/assets/bloodmagic/blockstates/item/itemblockdemoncrystal.json deleted file mode 100644 index 492f59ee..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/item/itemblockdemoncrystal.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "bloodmagic:crystal/Crystal1.obj", - "custom": { "flip-v": true }, - "transform": { - "translation": [ 0, 0, 1] - } - }, - "variants": { - "type": { - "default": { - "textures": { - "#crystal" : "bloodmagic:models/DefaultCrystal" - } - }, - "corrosive": { - "textures": { - "#crystal" : "bloodmagic:models/CorrosiveCrystal" - } - }, - "destructive": { - "textures": { - "#crystal" : "bloodmagic:models/DestructiveCrystal" - } - }, - "vengeful": { - "textures": { - "#crystal" : "bloodmagic:models/VengefulCrystal" - } - }, - "steadfast": { - "textures": { - "#crystal" : "bloodmagic:models/SteadfastCrystal" - } - } - } - } -} diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemdemoncrystal.json b/src/main/resources/assets/bloodmagic/blockstates/item_demon_crystal.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemdemoncrystal.json rename to src/main/resources/assets/bloodmagic/blockstates/item_demon_crystal.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemlivingarmourpointsupgrade.json b/src/main/resources/assets/bloodmagic/blockstates/item_points_upgrade.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemlivingarmourpointsupgrade.json rename to src/main/resources/assets/bloodmagic/blockstates/item_points_upgrade.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockitemroutingnode.json b/src/main/resources/assets/bloodmagic/blockstates/item_routing_node.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockitemroutingnode.json rename to src/main/resources/assets/bloodmagic/blockstates/item_routing_node.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemlavacrystal.json b/src/main/resources/assets/bloodmagic/blockstates/lava_crystal.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemlavacrystal.json rename to src/main/resources/assets/bloodmagic/blockstates/lava_crystal.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blocklifeessence.json b/src/main/resources/assets/bloodmagic/blockstates/life_essence.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blocklifeessence.json rename to src/main/resources/assets/bloodmagic/blockstates/life_essence.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemlivingarmour.json b/src/main/resources/assets/bloodmagic/blockstates/living_armour.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemlivingarmour.json rename to src/main/resources/assets/bloodmagic/blockstates/living_armour.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockmasterroutingnode.json b/src/main/resources/assets/bloodmagic/blockstates/master_routing_node.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockmasterroutingnode.json rename to src/main/resources/assets/bloodmagic/blockstates/master_routing_node.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockmimic.json b/src/main/resources/assets/bloodmagic/blockstates/mimic.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockmimic.json rename to src/main/resources/assets/bloodmagic/blockstates/mimic.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemmonstersoul.json b/src/main/resources/assets/bloodmagic/blockstates/monster_soul.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemmonstersoul.json rename to src/main/resources/assets/bloodmagic/blockstates/monster_soul.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemnoderouter.json b/src/main/resources/assets/bloodmagic/blockstates/node_router.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemnoderouter.json rename to src/main/resources/assets/bloodmagic/blockstates/node_router.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockoutputroutingnode.json b/src/main/resources/assets/bloodmagic/blockstates/output_routing_node.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockoutputroutingnode.json rename to src/main/resources/assets/bloodmagic/blockstates/output_routing_node.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itempacksacrifice.json b/src/main/resources/assets/bloodmagic/blockstates/pack_sacrifice.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itempacksacrifice.json rename to src/main/resources/assets/bloodmagic/blockstates/pack_sacrifice.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itempackselfsacrifice.json b/src/main/resources/assets/bloodmagic/blockstates/pack_self_sacrifice.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itempackselfsacrifice.json rename to src/main/resources/assets/bloodmagic/blockstates/pack_self_sacrifice.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockpath.json b/src/main/resources/assets/bloodmagic/blockstates/path.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockpath.json rename to src/main/resources/assets/bloodmagic/blockstates/path.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockphantom.json b/src/main/resources/assets/bloodmagic/blockstates/phantom.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockphantom.json rename to src/main/resources/assets/bloodmagic/blockstates/phantom.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itempotionflask.json b/src/main/resources/assets/bloodmagic/blockstates/potion_flask.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itempotionflask.json rename to src/main/resources/assets/bloodmagic/blockstates/potion_flask.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockritualcontroller.json b/src/main/resources/assets/bloodmagic/blockstates/ritual_controller.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockritualcontroller.json rename to src/main/resources/assets/bloodmagic/blockstates/ritual_controller.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemritualdiviner.json b/src/main/resources/assets/bloodmagic/blockstates/ritual_diviner.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemritualdiviner.json rename to src/main/resources/assets/bloodmagic/blockstates/ritual_diviner.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemritualreader.json b/src/main/resources/assets/bloodmagic/blockstates/ritual_reader.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemritualreader.json rename to src/main/resources/assets/bloodmagic/blockstates/ritual_reader.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockritualstone.json b/src/main/resources/assets/bloodmagic/blockstates/ritual_stone.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockritualstone.json rename to src/main/resources/assets/bloodmagic/blockstates/ritual_stone.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsacrificialdagger.json b/src/main/resources/assets/bloodmagic/blockstates/sacrificial_dagger.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsacrificialdagger.json rename to src/main/resources/assets/bloodmagic/blockstates/sacrificial_dagger.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsanguinebook.json b/src/main/resources/assets/bloodmagic/blockstates/sanguine_book.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsanguinebook.json rename to src/main/resources/assets/bloodmagic/blockstates/sanguine_book.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsentientarmour.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_armour.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsentientarmour.json rename to src/main/resources/assets/bloodmagic/blockstates/sentient_armour.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsentientarmourgem.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_armour_gem.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsentientarmourgem.json rename to src/main/resources/assets/bloodmagic/blockstates/sentient_armour_gem.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsentientaxe.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_axe.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsentientaxe.json rename to src/main/resources/assets/bloodmagic/blockstates/sentient_axe.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsentientbow.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_bow.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsentientbow.json rename to src/main/resources/assets/bloodmagic/blockstates/sentient_bow.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsentientpickaxe.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_pickaxe.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsentientpickaxe.json rename to src/main/resources/assets/bloodmagic/blockstates/sentient_pickaxe.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsentientshovel.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_shovel.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsentientshovel.json rename to src/main/resources/assets/bloodmagic/blockstates/sentient_shovel.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsentientsword.json b/src/main/resources/assets/bloodmagic/blockstates/sentient_sword.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsentientsword.json rename to src/main/resources/assets/bloodmagic/blockstates/sentient_sword.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilair.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_air.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilair.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_air.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilbloodlight.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_blood_light.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilbloodlight.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_blood_light.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilbounce.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_bounce.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilbounce.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_bounce.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilclaw.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_claw.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilclaw.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_claw.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilcompression.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_compression.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilcompression.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_compression.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigildivination.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_divination.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigildivination.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_divination.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilelementalaffinity.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_elemental_affinity.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilelementalaffinity.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_elemental_affinity.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilenderseverance.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_ender_severance.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilenderseverance.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_ender_severance.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilfastminer.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_fast_miner.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilfastminer.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_fast_miner.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilfrost.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_frost.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilfrost.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_frost.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilgreengrove.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_green_grove.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilgreengrove.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_green_grove.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilhaste.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_haste.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilhaste.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_haste.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilholding.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_holding.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilholding.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_holding.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigillava.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_lava.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigillava.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_lava.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilmagnetism.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_magnetism.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilmagnetism.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_magnetism.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilphantombridge.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_phantom_bridge.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilphantombridge.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_phantom_bridge.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilseer.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_seer.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilseer.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_seer.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilsuppression.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_suppression.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilsuppression.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_suppression.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilteleposition.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_teleposition.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilteleposition.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_teleposition.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigiltransposition.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_transposition.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigiltransposition.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_transposition.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilvoid.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_void.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilvoid.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_void.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilwater.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_water.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilwater.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_water.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsigilwhirlwind.json b/src/main/resources/assets/bloodmagic/blockstates/sigil_whirlwind.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsigilwhirlwind.json rename to src/main/resources/assets/bloodmagic/blockstates/sigil_whirlwind.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemslate.json b/src/main/resources/assets/bloodmagic/blockstates/slate.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemslate.json rename to src/main/resources/assets/bloodmagic/blockstates/slate.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blocksoulforge.json b/src/main/resources/assets/bloodmagic/blockstates/soul_forge.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blocksoulforge.json rename to src/main/resources/assets/bloodmagic/blockstates/soul_forge.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsoulgem.json b/src/main/resources/assets/bloodmagic/blockstates/soul_gem.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsoulgem.json rename to src/main/resources/assets/bloodmagic/blockstates/soul_gem.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemsoulsnare.json b/src/main/resources/assets/bloodmagic/blockstates/soul_snare.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemsoulsnare.json rename to src/main/resources/assets/bloodmagic/blockstates/soul_snare.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockspectral.json b/src/main/resources/assets/bloodmagic/blockstates/spectral.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockspectral.json rename to src/main/resources/assets/bloodmagic/blockstates/spectral.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blockteleposer.json b/src/main/resources/assets/bloodmagic/blockstates/teleposer.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blockteleposer.json rename to src/main/resources/assets/bloodmagic/blockstates/teleposer.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemtelepositionfocus.json b/src/main/resources/assets/bloodmagic/blockstates/teleposition_focus.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemtelepositionfocus.json rename to src/main/resources/assets/bloodmagic/blockstates/teleposition_focus.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/blocktestspellblock.json b/src/main/resources/assets/bloodmagic/blockstates/test_spell_block.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/blocktestspellblock.json rename to src/main/resources/assets/bloodmagic/blockstates/test_spell_block.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemupgradetome.json b/src/main/resources/assets/bloodmagic/blockstates/upgrade_tome.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemupgradetome.json rename to src/main/resources/assets/bloodmagic/blockstates/upgrade_tome.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itemupgradetrainer.json b/src/main/resources/assets/bloodmagic/blockstates/upgrade_trainer.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/itemupgradetrainer.json rename to src/main/resources/assets/bloodmagic/blockstates/upgrade_trainer.json diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 2b382440..77faec66 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -224,10 +224,10 @@ tile.bloodmagic.ritualStone.air.name=Ritual Stone of Air tile.bloodmagic.ritualStone.dusk.name=Ritual Stone of Dusk tile.bloodmagic.ritualStone.dawn.name=Ritual Stone of Dawn -tile.bloodmagic.bloodstonebrick.large.name=Large Bloodstone Brick -tile.bloodmagic.bloodstonebrick.brick.name=Bloodstone Brick -tile.bloodmagic.crystal.large.name=Crystal Cluster -tile.bloodmagic.crystal.brick.name=Crystal Cluster Brick +tile.bloodmagic.bloodstone_tile.name=Large Bloodstone Tile +tile.bloodmagic.bloodstone_brick.name=Bloodstone Brick +tile.bloodmagic.crystal_tile.name=Crystal Cluster +tile.bloodmagic.crystal_brick.name=Crystal Cluster Brick tile.bloodmagic.bloodLight.name=Blood Light tile.bloodmagic.spectralBlock.name=Spectral Block tile.bloodmagic.phantom.name=Phantom Block