lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some models work, some don't

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-08-15 23:01:36 -07:00
parent 08258fd6ef
commit 3b173ecf17
115 changed files with 72 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java
View file

@ -60,13 +60,14 @@ public class RegistrarBloodMagic {
@SubscribeEvent
public static void registerBloodOrbs(RegistryEvent.Register<BloodOrb> 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")
);
}

8
src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java
View file

@ -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<Block> blocks;
static List<Block> blocks;
@SubscribeEvent
public static void registerBlocks(RegistryEvent.Register<Block> 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"),

2
src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java
View file

@ -74,7 +74,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable {
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> subItems) {
if (isInCreativeTab(tab))
if (!isInCreativeTab(tab))
return;
subItems.add(Utils.setUnbreakable(new ItemStack(this)));

5
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java
View file

@ -61,9 +61,10 @@ public class ItemBlockBloodTank extends ItemBlock {
@SideOnly(Side.CLIENT)
public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> 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) {