fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Flattened the magic crystal blocks, renamed crystal items

Browse Source
This commit is contained in:
WinDanesz
2022-09-09 22:51:18 +02:00
parent d30a40bdc4
commit b1e70c01f0
80 changed files with 421 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/registry/WizardryBlocks.java
+19 -2
View File
@@ -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));
src/main/java/electroblob/wizardry/registry/WizardryItems.java
+25 -17
View File
@@ -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));
src/main/java/electroblob/wizardry/registry/WizardryRecipes.java
+1 -1
View File
@@ -59,7 +59,7 @@ public final class WizardryRecipes {
IForgeRegistry<IRecipe> 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