Huge commit for the Pull-Request.
Added a lot of things: - Blood Tank - Teleposition Sigil - Transposition Sigil - Cobblestone/Netherrack/Obisidian generation Ritual - Tree Cutter Ritual - Pump Ritual - Altar Builder Ritual - Block Placing Ritual - Portal Ritual - Teleportation System and API Components - Cross pattern Area Descriptor - Two reagents and their textures for the sigils’ crafting Fixed: - Teleposer not teleporting entities correctly And probably other things I forgot!
This commit is contained in:
Tombenpotter
parent
d947f23696
commit
7e8aec8652
53 changed files with 3031 additions and 372 deletions
|
|
@ -1,57 +1,18 @@
|
|||
package WayofTime.bloodmagic.registry;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.ConfigHandler;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import WayofTime.bloodmagic.api.Constants;
|
||||
import WayofTime.bloodmagic.block.BlockAlchemyArray;
|
||||
import WayofTime.bloodmagic.block.BlockAltar;
|
||||
import WayofTime.bloodmagic.block.BlockBloodLight;
|
||||
import WayofTime.bloodmagic.block.BlockBloodRune;
|
||||
import WayofTime.bloodmagic.block.BlockBloodStoneBrick;
|
||||
import WayofTime.bloodmagic.block.BlockCrystal;
|
||||
import WayofTime.bloodmagic.block.BlockDemonCrucible;
|
||||
import WayofTime.bloodmagic.block.BlockIncenseAltar;
|
||||
import WayofTime.bloodmagic.block.BlockInputRoutingNode;
|
||||
import WayofTime.bloodmagic.block.BlockItemRoutingNode;
|
||||
import WayofTime.bloodmagic.block.BlockLifeEssence;
|
||||
import WayofTime.bloodmagic.block.BlockMasterRoutingNode;
|
||||
import WayofTime.bloodmagic.block.BlockOutputRoutingNode;
|
||||
import WayofTime.bloodmagic.block.BlockPath;
|
||||
import WayofTime.bloodmagic.block.BlockPedestal;
|
||||
import WayofTime.bloodmagic.block.BlockPhantom;
|
||||
import WayofTime.bloodmagic.block.BlockRitualController;
|
||||
import WayofTime.bloodmagic.block.BlockRitualStone;
|
||||
import WayofTime.bloodmagic.block.BlockSoulForge;
|
||||
import WayofTime.bloodmagic.block.BlockSpectral;
|
||||
import WayofTime.bloodmagic.block.BlockTeleposer;
|
||||
import WayofTime.bloodmagic.item.block.ItemBlockBloodRune;
|
||||
import WayofTime.bloodmagic.item.block.ItemBlockBloodStoneBrick;
|
||||
import WayofTime.bloodmagic.item.block.ItemBlockCrystal;
|
||||
import WayofTime.bloodmagic.item.block.ItemBlockPath;
|
||||
import WayofTime.bloodmagic.item.block.ItemBlockPedestal;
|
||||
import WayofTime.bloodmagic.item.block.ItemBlockRitualController;
|
||||
import WayofTime.bloodmagic.item.block.ItemBlockRitualStone;
|
||||
import WayofTime.bloodmagic.tile.TileAlchemyArray;
|
||||
import WayofTime.bloodmagic.tile.TileAltar;
|
||||
import WayofTime.bloodmagic.tile.TileDemonCrucible;
|
||||
import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
|
||||
import WayofTime.bloodmagic.tile.TileIncenseAltar;
|
||||
import WayofTime.bloodmagic.tile.TileMasterRitualStone;
|
||||
import WayofTime.bloodmagic.tile.TilePhantomBlock;
|
||||
import WayofTime.bloodmagic.tile.TilePlinth;
|
||||
import WayofTime.bloodmagic.tile.TileSoulForge;
|
||||
import WayofTime.bloodmagic.tile.TileSpectralBlock;
|
||||
import WayofTime.bloodmagic.tile.TileTeleposer;
|
||||
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 WayofTime.bloodmagic.block.*;
|
||||
import WayofTime.bloodmagic.item.block.*;
|
||||
import WayofTime.bloodmagic.tile.*;
|
||||
import WayofTime.bloodmagic.tile.routing.*;
|
||||
import WayofTime.bloodmagic.util.helper.InventoryRenderHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public class ModBlocks
|
||||
{
|
||||
|
|
@ -60,7 +21,7 @@ public class ModBlocks
|
|||
public static Block ritualController;
|
||||
public static Block ritualStone;
|
||||
public static Block bloodLight;
|
||||
// public static Block testSpellBlock;
|
||||
// public static Block testSpellBlock;
|
||||
public static Block pedestal;
|
||||
public static Block teleposer;
|
||||
public static Block alchemyArray;
|
||||
|
|
@ -81,6 +42,9 @@ public class ModBlocks
|
|||
public static Block outputRoutingNode;
|
||||
public static Block itemRoutingNode;
|
||||
|
||||
public static Block dimensionalPortal;
|
||||
public static Block bloodTank;
|
||||
|
||||
public static void init()
|
||||
{
|
||||
FluidRegistry.registerFluid(BlockLifeEssence.getLifeEssence());
|
||||
|
|
@ -107,6 +71,9 @@ public class ModBlocks
|
|||
pathBlock = registerBlock(new BlockPath(), ItemBlockPath.class);
|
||||
demonCrucible = registerBlock(new BlockDemonCrucible());
|
||||
|
||||
dimensionalPortal = registerBlock(new BlockDimensionalPortal());
|
||||
bloodTank = registerBlock(new BlockBloodTank(), ItemBlockBloodTank.class);
|
||||
|
||||
// testSpellBlock = registerBlock(new BlockTestSpellBlock());
|
||||
|
||||
BloodMagicAPI.addToTeleposerBlacklist(inputRoutingNode);
|
||||
|
|
@ -133,6 +100,9 @@ public class ModBlocks
|
|||
GameRegistry.registerTileEntity(TileItemRoutingNode.class, Constants.Mod.MODID + ":" + TileItemRoutingNode.class.getSimpleName());
|
||||
GameRegistry.registerTileEntity(TileIncenseAltar.class, Constants.Mod.MODID + ":" + TileIncenseAltar.class.getSimpleName());
|
||||
GameRegistry.registerTileEntity(TileDemonCrucible.class, Constants.Mod.MODID + ":" + TileDemonCrucible.class.getSimpleName());
|
||||
|
||||
GameRegistry.registerTileEntity(TileDimensionalPortal.class, Constants.Mod.MODID + ":" + TileDimensionalPortal.class.getSimpleName());
|
||||
GameRegistry.registerTileEntity(TileBloodTank.class, Constants.Mod.MODID + ":" + TileBloodTank.class.getSimpleName());
|
||||
}
|
||||
|
||||
public static void initRenders()
|
||||
|
|
@ -181,6 +151,8 @@ public class ModBlocks
|
|||
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 5);
|
||||
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 6);
|
||||
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 7);
|
||||
|
||||
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(dimensionalPortal));
|
||||
}
|
||||
|
||||
private static Block registerBlock(Block block, Class<? extends ItemBlock> itemBlock, String name)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package WayofTime.bloodmagic.registry;
|
||||
|
||||
import WayofTime.bloodmagic.item.sigil.*;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.util.EnumHelper;
|
||||
|
|
@ -36,23 +37,6 @@ import WayofTime.bloodmagic.item.gear.ItemPackSacrifice;
|
|||
import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice;
|
||||
import WayofTime.bloodmagic.item.routing.ItemNodeRouter;
|
||||
import WayofTime.bloodmagic.item.routing.ItemRouterFilter;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilAir;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilBloodLight;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilCompression;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilDivination;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilElementalAffinity;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilEnderSeverance;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilFastMiner;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilGreenGrove;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilHaste;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilLava;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilMagnetism;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilPhantomBridge;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilSeer;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilSuppression;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilVoid;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilWater;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilWhirlwind;
|
||||
import WayofTime.bloodmagic.item.soul.ItemMonsterSoul;
|
||||
import WayofTime.bloodmagic.item.soul.ItemSentientArmourGem;
|
||||
import WayofTime.bloodmagic.item.soul.ItemSentientBow;
|
||||
|
|
@ -109,6 +93,9 @@ public class ModItems
|
|||
public static Item sigilPhantomBridge;
|
||||
public static Item sigilCompression;
|
||||
|
||||
public static Item sigilTeleposition;
|
||||
public static Item sigilTransposition;
|
||||
|
||||
public static Item itemComponent;
|
||||
public static Item telepositionFocus;
|
||||
|
||||
|
|
@ -198,6 +185,9 @@ public class ModItems
|
|||
sigilCompression = registerItem(new ItemSigilCompression());
|
||||
sigilEnderSeverance = registerItem(new ItemSigilEnderSeverance());
|
||||
|
||||
sigilTeleposition = registerItem(new ItemSigilTeleposition());
|
||||
sigilTransposition = registerItem(new ItemSigilTransposition());
|
||||
|
||||
itemComponent = registerItem(new ItemComponent());
|
||||
telepositionFocus = registerItem(new ItemTelepositionFocus());
|
||||
|
||||
|
|
@ -362,6 +352,9 @@ public class ModItems
|
|||
renderHelper.itemRender(sigilEnderSeverance, 0);
|
||||
renderHelper.itemRender(sigilEnderSeverance, 1);
|
||||
|
||||
renderHelper.itemRender(sigilTeleposition);
|
||||
renderHelper.itemRender(sigilTransposition);
|
||||
|
||||
renderHelper.customItemRender(sentientSword, 0);
|
||||
renderHelper.customItemRender(sentientSword, 1);
|
||||
renderHelper.itemRender(sentientBow, 0, "ItemSentientBow");
|
||||
|
|
|
|||
|
|
@ -160,6 +160,10 @@ public class ModRecipes
|
|||
AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE), new ItemStack(ModItems.slate, 1, 3), new ItemStack(ModItems.sigilPhantomBridge), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
|
||||
AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION), new ItemStack(ModItems.slate, 1, 3), new ItemStack(ModItems.sigilCompression), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
|
||||
AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE), new ItemStack(ModItems.slate, 1, 3), new ItemStack(ModItems.sigilEnderSeverance), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
|
||||
|
||||
AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), new ItemStack(ModItems.slate, 1, 3), new ItemStack(ModItems.sigilTeleposition), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
|
||||
AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), new ItemStack(ModItems.slate, 1, 3), new ItemStack(ModItems.sigilTransposition), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
|
||||
|
||||
}
|
||||
|
||||
public static void addCompressionHandlers()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package WayofTime.bloodmagic.registry;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import WayofTime.bloodmagic.ConfigHandler;
|
||||
import WayofTime.bloodmagic.api.BlockStack;
|
||||
import WayofTime.bloodmagic.api.registry.HarvestRegistry;
|
||||
|
|
@ -8,26 +7,7 @@ import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry;
|
|||
import WayofTime.bloodmagic.api.registry.RitualRegistry;
|
||||
import WayofTime.bloodmagic.api.ritual.Ritual;
|
||||
import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
|
||||
import WayofTime.bloodmagic.ritual.RitualAnimalGrowth;
|
||||
import WayofTime.bloodmagic.ritual.RitualArmourEvolve;
|
||||
import WayofTime.bloodmagic.ritual.RitualContainment;
|
||||
import WayofTime.bloodmagic.ritual.RitualCrushing;
|
||||
import WayofTime.bloodmagic.ritual.RitualExpulsion;
|
||||
import WayofTime.bloodmagic.ritual.RitualFeatheredKnife;
|
||||
import WayofTime.bloodmagic.ritual.RitualFullStomach;
|
||||
import WayofTime.bloodmagic.ritual.RitualGreenGrove;
|
||||
import WayofTime.bloodmagic.ritual.RitualHarvest;
|
||||
import WayofTime.bloodmagic.ritual.RitualInterdiction;
|
||||
import WayofTime.bloodmagic.ritual.RitualJumping;
|
||||
import WayofTime.bloodmagic.ritual.RitualLava;
|
||||
import WayofTime.bloodmagic.ritual.RitualMagnetic;
|
||||
import WayofTime.bloodmagic.ritual.RitualRegeneration;
|
||||
import WayofTime.bloodmagic.ritual.RitualSpeed;
|
||||
import WayofTime.bloodmagic.ritual.RitualSuppression;
|
||||
import WayofTime.bloodmagic.ritual.RitualUpgradeRemove;
|
||||
import WayofTime.bloodmagic.ritual.RitualWater;
|
||||
import WayofTime.bloodmagic.ritual.RitualWellOfSuffering;
|
||||
import WayofTime.bloodmagic.ritual.RitualZephyr;
|
||||
import WayofTime.bloodmagic.ritual.*;
|
||||
import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable;
|
||||
import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem;
|
||||
import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall;
|
||||
|
|
@ -35,6 +15,7 @@ import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualNight;
|
|||
import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRain;
|
||||
import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualResistance;
|
||||
import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualZombie;
|
||||
import net.minecraft.init.Blocks;
|
||||
|
||||
public class ModRituals
|
||||
{
|
||||
|
|
@ -58,6 +39,13 @@ public class ModRituals
|
|||
public static Ritual zephyrRitual;
|
||||
public static Ritual upgradeRemoveRitual;
|
||||
public static Ritual armourEvolveRitual;
|
||||
|
||||
public static Ritual cobblestoneRitual;
|
||||
public static Ritual placerRitual;
|
||||
public static Ritual fellingRitual;
|
||||
public static Ritual pumpRitual;
|
||||
public static Ritual altarBuilderRitual;
|
||||
public static Ritual portalRitual;
|
||||
|
||||
public static ImperfectRitual imperfectNight;
|
||||
public static ImperfectRitual imperfectRain;
|
||||
|
|
@ -107,6 +95,19 @@ public class ModRituals
|
|||
RitualRegistry.registerRitual(upgradeRemoveRitual, ConfigHandler.ritualUpgradeRemove);
|
||||
armourEvolveRitual = new RitualArmourEvolve();
|
||||
RitualRegistry.registerRitual(armourEvolveRitual, ConfigHandler.ritualArmourEvolve);
|
||||
|
||||
cobblestoneRitual = new RitualCobblestone();
|
||||
RitualRegistry.registerRitual(cobblestoneRitual, ConfigHandler.cobblestoneRitual);
|
||||
placerRitual = new RitualPlacer();
|
||||
RitualRegistry.registerRitual(placerRitual, ConfigHandler.placerRitual);
|
||||
fellingRitual = new RitualFelling();
|
||||
RitualRegistry.registerRitual(fellingRitual, ConfigHandler.fellingRitual);
|
||||
pumpRitual = new RitualPump();
|
||||
RitualRegistry.registerRitual(pumpRitual, ConfigHandler.pumpRitual);
|
||||
altarBuilderRitual = new RitualAltarBuilder();
|
||||
RitualRegistry.registerRitual(altarBuilderRitual, ConfigHandler.altarBuilderRitual);
|
||||
portalRitual = new RitualPortal();
|
||||
RitualRegistry.registerRitual(portalRitual, ConfigHandler.portalRitual);
|
||||
}
|
||||
|
||||
public static void initImperfectRituals()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue