Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

updated classes using Aether API

Browse source
This commit is contained in:
Kino 2017-12-09 16:06:51 -05:00
parent a51127b8a5
commit b261a118e7
15 changed files with 68 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/legacy/aether/containers/ContainerAccessories.java
View file

@ -9,7 +9,7 @@ import net.minecraft.inventory.Slot;
import net.minecraft.inventory.SlotCrafting;
import net.minecraft.item.ItemStack;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.api.accessories.AccessoryType;
import com.legacy.aether.containers.inventory.InventoryAccessories;
import com.legacy.aether.containers.slots.SlotAccessory;
@ -98,9 +98,9 @@ public class ContainerAccessories extends ContainerPlayer
{
int newSlotIndex = -1;
if (AetherRegistry.getInstance().isAccessory(stack))
if (AetherAPI.getInstance().isAccessory(stack))
{
newSlotIndex = this.getAccessorySlot(AetherRegistry.getInstance().getAccessory(stack).getAccessoryType());
newSlotIndex = this.getAccessorySlot(AetherAPI.getInstance().getAccessory(stack).getAccessoryType());
}
if (newSlotIndex != -1)

6
src/main/java/com/legacy/aether/containers/ContainerEnchanter.java
View file

@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.containers.slots.SlotEnchanter;
import com.legacy.aether.tile_entities.TileEntityEnchanter;
@ -133,14 +133,14 @@ public class ContainerEnchanter extends Container
}
else if (par2 != 1 && par2 != 0)
{
if (AetherRegistry.getInstance().hasEnchantment(itemstack))
if (AetherAPI.getInstance().hasEnchantment(itemstack))
{
if (!this.mergeItemStack(itemstack1, 0, 1, false))
{
return null;
}
}
else if (AetherRegistry.getInstance().isEnchantmentFuel(itemstack1))
else if (AetherAPI.getInstance().isEnchantmentFuel(itemstack1))
{
if (!this.mergeItemStack(itemstack1, 1, 2, false))
{

6
src/main/java/com/legacy/aether/containers/ContainerFreezer.java
View file

@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.containers.slots.SlotFreezer;
import com.legacy.aether.tile_entities.TileEntityFreezer;
@ -133,14 +133,14 @@ public class ContainerFreezer extends Container
}
else if (par2 != 1 && par2 != 0)
{
if (AetherRegistry.getInstance().hasFreezable(itemstack1))
if (AetherAPI.getInstance().hasFreezable(itemstack1))
{
if (!this.mergeItemStack(itemstack1, 0, 1, false))
{
return null;
}
}
else if (AetherRegistry.getInstance().isFreezableFuel(itemstack1))
else if (AetherAPI.getInstance().isFreezableFuel(itemstack1))
{
if (!this.mergeItemStack(itemstack1, 1, 2, false))
{

6
src/main/java/com/legacy/aether/containers/inventory/InventoryAccessories.java
View file

@ -13,7 +13,7 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.text.ITextComponent;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.api.accessories.AccessoryType;
import com.legacy.aether.api.accessories.AetherAccessory;
import com.legacy.aether.player.PlayerAether;
@ -100,9 +100,9 @@ public class InventoryAccessories implements IInventory
public boolean setInventoryAccessory(ItemStack stack)
{
if (stack != null && AetherRegistry.getInstance().isAccessory(stack))
if (stack != null && AetherAPI.getInstance().isAccessory(stack))
{
AetherAccessory accessory = AetherRegistry.getInstance().getAccessory(stack);
AetherAccessory accessory = AetherAPI.getInstance().getAccessory(stack);
int stackIndex = 0;

8
src/main/java/com/legacy/aether/containers/slots/SlotAccessory.java
View file

@ -7,11 +7,11 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.api.accessories.AccessoryType;
import com.legacy.aether.api.accessories.AetherAccessory;
import com.legacy.aether.api.events.AetherHooks;
import com.legacy.aether.containers.inventory.InventoryAccessories;
import com.legacy.aether.events.AetherHooks;
public class SlotAccessory extends Slot
{
@ -31,9 +31,9 @@ public class SlotAccessory extends Slot
@Override
public boolean isItemValid(ItemStack stack)
{
if (AetherRegistry.getInstance().isAccessory(stack))
if (AetherAPI.getInstance().isAccessory(stack))
{
AetherAccessory accessory = AetherRegistry.getInstance().getAccessory(stack);
AetherAccessory accessory = AetherAPI.getInstance().getAccessory(stack);
if (accessory.getAccessoryType() == this.getAccessoryType())
{

10
src/main/java/com/legacy/aether/entities/AetherEntities.java
View file

@ -5,7 +5,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.registry.EntityRegistry;
import com.legacy.aether.Aether;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.api.moa.AetherMoaType;
import com.legacy.aether.api.moa.MoaProperties;
import com.legacy.aether.entities.block.EntityFloatingBlock;
@ -90,10 +90,10 @@ public class AetherEntities
register(EntityParachute.class, "parachute", 31);
register(EntityWhirlwind.class, "whirlwind", 32, 0x9fc3f7, 0xffffff);
BLUE_MOA = AetherRegistry.getInstance().register(new ResourceLocation("aether_legacy", "blue"), new AetherMoaType(0x7777FF, new MoaProperties(3, 100, 0.3F), AetherCreativeTabs.misc));
ORANGE_MOA = AetherRegistry.getInstance().register(new ResourceLocation("aether_legacy", "orange"), new AetherMoaType(-0xC3D78, new MoaProperties(2, 50, 0.6F), AetherCreativeTabs.misc));
WHITE_MOA = AetherRegistry.getInstance().register(new ResourceLocation("aether_legacy", "white"), new AetherMoaType(0xFFFFFF, new MoaProperties(4, 20, 0.3F), AetherCreativeTabs.misc));
BLACK_MOA = AetherRegistry.getInstance().register(new ResourceLocation("aether_legacy", "black"), new AetherMoaType(0x222222, new MoaProperties(8, 5, 0.3F), AetherCreativeTabs.misc));
BLUE_MOA = AetherAPI.getInstance().register(new ResourceLocation("aether_legacy", "blue"), new AetherMoaType(0x7777FF, new MoaProperties(3, 100, 0.3F), AetherCreativeTabs.misc));
ORANGE_MOA = AetherAPI.getInstance().register(new ResourceLocation("aether_legacy", "orange"), new AetherMoaType(-0xC3D78, new MoaProperties(2, 50, 0.6F), AetherCreativeTabs.misc));
WHITE_MOA = AetherAPI.getInstance().register(new ResourceLocation("aether_legacy", "white"), new AetherMoaType(0xFFFFFF, new MoaProperties(4, 20, 0.3F), AetherCreativeTabs.misc));
BLACK_MOA = AetherAPI.getInstance().register(new ResourceLocation("aether_legacy", "black"), new AetherMoaType(0x222222, new MoaProperties(8, 5, 0.3F), AetherCreativeTabs.misc));
DataSerializerRegistry.initialize();
}

14
src/main/java/com/legacy/aether/entities/passive/mountable/EntityMoa.java
View file

@ -26,7 +26,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.api.moa.AetherMoaType;
import com.legacy.aether.entities.util.EntitySaddleMount;
import com.legacy.aether.items.ItemMoaEgg;
@ -97,9 +97,9 @@ public class EntityMoa extends EntitySaddleMount
{
super.entityInit();
AetherMoaType moaType = AetherRegistry.getInstance().getRandomMoaType();
AetherMoaType moaType = AetherAPI.getInstance().getRandomMoaType();
this.dataManager.register(MOA_TYPE_ID, AetherRegistry.getInstance().getMoaTypeId(moaType));
this.dataManager.register(MOA_TYPE_ID, AetherAPI.getInstance().getMoaTypeId(moaType));
this.dataManager.register(REMAINING_JUMPS, moaType.getMoaProperties().getMaxJumps());
this.dataManager.register(PLAYER_GROWN, false);
@ -189,12 +189,12 @@ public class EntityMoa extends EntitySaddleMount
public AetherMoaType getMoaType()
{
return AetherRegistry.getInstance().getMoaType(this.dataManager.get(MOA_TYPE_ID));
return AetherAPI.getInstance().getMoaType(this.dataManager.get(MOA_TYPE_ID));
}
public void setMoaType(AetherMoaType moaType)
{
this.dataManager.set(MOA_TYPE_ID, AetherRegistry.getInstance().getMoaTypeId(moaType));
this.dataManager.set(MOA_TYPE_ID, AetherAPI.getInstance().getMoaTypeId(moaType));
}
@Override
@ -399,7 +399,7 @@ public class EntityMoa extends EntitySaddleMount
nbt.setByte("amountFed", this.getAmountFed());
nbt.setBoolean("isHungry", this.isHungry());
nbt.setBoolean("isSitting", this.isSitting());
nbt.setInteger("typeId", AetherRegistry.getInstance().getMoaTypeId(this.getMoaType()));
nbt.setInteger("typeId", AetherAPI.getInstance().getMoaTypeId(this.getMoaType()));
}
@Override
@ -409,7 +409,7 @@ public class EntityMoa extends EntitySaddleMount
this.setPlayerGrown(nbt.getBoolean("playerGrown"));
this.setRemainingJumps(nbt.getInteger("remainingJumps"));
this.setMoaType(AetherRegistry.getInstance().getMoaType(nbt.getInteger("typeId")));
this.setMoaType(AetherAPI.getInstance().getMoaType(nbt.getInteger("typeId")));
this.setAmountFed(nbt.getByte("amountFed"));
this.setHungry(nbt.getBoolean("isHungry"));
this.setSitting(nbt.getBoolean("isSitting"));

20
src/main/java/com/legacy/aether/items/ItemMoaEgg.java
View file

@ -14,7 +14,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.world.World;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.api.moa.AetherMoaType;
import com.legacy.aether.entities.passive.mountable.EntityMoa;
import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs;
@ -39,7 +39,7 @@ public class ItemMoaEgg extends Item
{
if (playerIn.capabilities.isCreativeMode)
{
EntityMoa moa = new EntityMoa(worldIn, AetherRegistry.getInstance().getMoaType(stack.getTagCompound().getInteger("typeId")));
EntityMoa moa = new EntityMoa(worldIn, AetherAPI.getInstance().getMoaType(stack.getTagCompound().getInteger("typeId")));
moa.moveToBlockPosAndAngles(pos.up(), 1.0F, 1.0F);
moa.setPlayerGrown(true);
@ -58,11 +58,11 @@ public class ItemMoaEgg extends Item
@Override
public void getSubItems(Item itemIn, CreativeTabs tab, List<ItemStack> subItems)
{
for (int moaTypeSize = 0; moaTypeSize < AetherRegistry.getInstance().getMoaTypeSize(); ++moaTypeSize)
for (int moaTypeSize = 0; moaTypeSize < AetherAPI.getInstance().getMoaTypeSize(); ++moaTypeSize)
{
ItemStack stack = new ItemStack(this);
NBTTagCompound compound = new NBTTagCompound();
AetherMoaType moaType = AetherRegistry.getInstance().getMoaType(moaTypeSize);
AetherMoaType moaType = AetherAPI.getInstance().getMoaType(moaTypeSize);
if (moaType.getCreativeTab() == tab)
{
@ -86,12 +86,12 @@ public class ItemMoaEgg extends Item
if (tag != null)
{
AetherMoaType moaType = AetherRegistry.getInstance().getMoaType(tag.getInteger("typeId"));
AetherMoaType moaType = AetherAPI.getInstance().getMoaType(tag.getInteger("typeId"));
return moaType.getMoaEggColor();
}
return AetherRegistry.getInstance().getMoaType(0).getMoaEggColor();
return AetherAPI.getInstance().getMoaType(0).getMoaEggColor();
}
public AetherMoaType getMoaTypeFromItemStack(ItemStack stack)
@ -100,12 +100,12 @@ public class ItemMoaEgg extends Item
if (tag != null)
{
AetherMoaType moaType = AetherRegistry.getInstance().getMoaType(tag.getInteger("typeId"));
AetherMoaType moaType = AetherAPI.getInstance().getMoaType(tag.getInteger("typeId"));
return moaType;
}
return AetherRegistry.getInstance().getMoaType(0);
return AetherAPI.getInstance().getMoaType(0);
}
@Override
@ -115,7 +115,7 @@ public class ItemMoaEgg extends Item
if (tag != null && stack.getTagCompound().hasKey("typeId"))
{
AetherMoaType moaType = AetherRegistry.getInstance().getMoaType(tag.getInteger("typeId"));
AetherMoaType moaType = AetherAPI.getInstance().getMoaType(tag.getInteger("typeId"));
return new TextComponentTranslation("item." + moaType.getRegistryName().getResourcePath().replace(" ", "_").toLowerCase() + "_moa_egg.name", new Object[0]).getFormattedText();
}
@ -135,7 +135,7 @@ public class ItemMoaEgg extends Item
NBTTagCompound tag = new NBTTagCompound();
tag.setInteger("typeId", AetherRegistry.getInstance().getMoaTypeId(type));
tag.setInteger("typeId", AetherAPI.getInstance().getMoaTypeId(type));
stack.setTagCompound(tag);

12
src/main/java/com/legacy/aether/registry/AetherRegistries.java
View file

@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraftforge.fml.common.registry.GameRegistry;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.api.accessories.AccessoryType;
import com.legacy.aether.api.accessories.AetherAccessory;
import com.legacy.aether.api.enchantments.AetherEnchantment;
@ -32,7 +32,7 @@ public class AetherRegistries
public static void initializeAccessories()
{
AetherRegistry registry = AetherRegistry.getInstance();
AetherAPI registry = AetherAPI.getInstance();
registry.register(new AetherAccessory(ItemsAether.leather_gloves, AccessoryType.GLOVE));
registry.register(new AetherAccessory(ItemsAether.iron_gloves, AccessoryType.GLOVE));
@ -74,7 +74,7 @@ public class AetherRegistries
public static void initializeEnchantments()
{
AetherRegistry registry = AetherRegistry.getInstance();
AetherAPI registry = AetherAPI.getInstance();
registry.register(new AetherEnchantment(ItemsAether.skyroot_pickaxe, 225));
registry.register(new AetherEnchantment(ItemsAether.skyroot_axe, 225));
@ -120,7 +120,7 @@ public class AetherRegistries
registry.register(new AetherEnchantment(Items.BOW, 4000));
registry.register(new AetherEnchantment(Items.FISHING_ROD, 600));
registry.register(new AetherEnchantment(Items.RECORD_11, ItemsAether.aether_tune, 2500));
/*registry.register(new AetherEnchantment(Items.RECORD_11, ItemsAether.aether_tune, 2500));
registry.register(new AetherEnchantment(Items.RECORD_13, ItemsAether.aether_tune, 2500));
registry.register(new AetherEnchantment(Items.RECORD_BLOCKS, ItemsAether.aether_tune, 2500));
registry.register(new AetherEnchantment(Items.RECORD_CAT, ItemsAether.aether_tune, 2500));
@ -130,7 +130,7 @@ public class AetherRegistries
registry.register(new AetherEnchantment(Items.RECORD_STAL, ItemsAether.aether_tune, 2500));
registry.register(new AetherEnchantment(Items.RECORD_STRAD, ItemsAether.aether_tune, 2500));
registry.register(new AetherEnchantment(Items.RECORD_WAIT, ItemsAether.aether_tune, 2500));
registry.register(new AetherEnchantment(Items.RECORD_WARD, ItemsAether.aether_tune, 2500));
registry.register(new AetherEnchantment(Items.RECORD_WARD, ItemsAether.aether_tune, 2500));*/
registry.register(new AetherEnchantment(Items.WOODEN_PICKAXE, 225));
registry.register(new AetherEnchantment(Items.WOODEN_AXE, 225));
@ -182,7 +182,7 @@ public class AetherRegistries
public static void initializeFreezables()
{
AetherRegistry registry = AetherRegistry.getInstance();
AetherAPI registry = AetherAPI.getInstance();
registry.register(new AetherFreezable(BlocksAether.aercloud, new ItemStack(BlocksAether.aercloud, 1, 1), 100));
registry.register(new AetherFreezable(BlocksAether.aether_leaves, BlocksAether.crystal_leaves, 150));

16
src/main/java/com/legacy/aether/tile_entities/TileEntityEnchanter.java
View file

@ -13,10 +13,10 @@ import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.api.enchantments.AetherEnchantment;
import com.legacy.aether.api.events.AetherHooks;
import com.legacy.aether.blocks.BlocksAether;
import com.legacy.aether.events.AetherHooks;
import com.legacy.aether.tile_entities.util.AetherTileEntity;
public class TileEntityEnchanter extends AetherTileEntity
@ -60,7 +60,7 @@ public class TileEntityEnchanter extends AetherTileEntity
if (this.currentEnchantment != null)
{
if (this.getStackInSlot(0) == null || AetherRegistry.getInstance().hasEnchantment(this.getStackInSlot(0)) && AetherRegistry.getInstance().getEnchantment(this.getStackInSlot(0)).equals(this.currentEnchantment))
if (this.getStackInSlot(0) == null || AetherAPI.getInstance().hasEnchantment(this.getStackInSlot(0)) && AetherAPI.getInstance().getEnchantment(this.getStackInSlot(0)).equals(this.currentEnchantment))
{
this.currentEnchantment = null;
this.enchantmentProgress = 0;
@ -99,9 +99,9 @@ public class TileEntityEnchanter extends AetherTileEntity
AetherHooks.onItemEnchant(this, this.currentEnchantment);
}
if (this.enchantmentTimeRemaining <= 0 && AetherRegistry.getInstance().isEnchantmentFuel(this.getStackInSlot(1)))
if (this.enchantmentTimeRemaining <= 0 && AetherAPI.getInstance().isEnchantmentFuel(this.getStackInSlot(1)))
{
this.enchantmentTimeRemaining += AetherRegistry.getInstance().getEnchantmentFuel(this.getStackInSlot(1)).getTimeGiven();
this.enchantmentTimeRemaining += AetherAPI.getInstance().getEnchantmentFuel(this.getStackInSlot(1)).getTimeGiven();
if (!this.worldObj.isRemote)
{
@ -114,7 +114,7 @@ public class TileEntityEnchanter extends AetherTileEntity
if (this.getStackInSlot(0) != null)
{
ItemStack itemstack = this.getStackInSlot(0);
AetherEnchantment enchantment = AetherRegistry.getInstance().getEnchantment(itemstack);
AetherEnchantment enchantment = AetherAPI.getInstance().getEnchantment(itemstack);
if (enchantment != null)
{
@ -297,11 +297,11 @@ public class TileEntityEnchanter extends AetherTileEntity
{
return false;
}
else if (slot == 1 && AetherRegistry.getInstance().isEnchantmentFuel(stackInSlot))
else if (slot == 1 && AetherAPI.getInstance().isEnchantmentFuel(stackInSlot))
{
return true;
}
else if (slot == 0 && AetherRegistry.getInstance().hasEnchantment(stackInSlot))
else if (slot == 0 && AetherAPI.getInstance().hasEnchantment(stackInSlot))
{
return true;
}

16
src/main/java/com/legacy/aether/tile_entities/TileEntityFreezer.java
View file

@ -13,10 +13,10 @@ import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.api.events.AetherHooks;
import com.legacy.aether.api.freezables.AetherFreezable;
import com.legacy.aether.blocks.BlocksAether;
import com.legacy.aether.events.AetherHooks;
import com.legacy.aether.tile_entities.util.AetherTileEntity;
public class TileEntityFreezer extends AetherTileEntity
@ -60,7 +60,7 @@ public class TileEntityFreezer extends AetherTileEntity
if (this.currentFreezable != null)
{
if (this.getStackInSlot(0) == null || AetherRegistry.getInstance().hasFreezable(this.getStackInSlot(0)) && AetherRegistry.getInstance().getFreezable(this.getStackInSlot(0)).equals(this.currentFreezable))
if (this.getStackInSlot(0) == null || AetherAPI.getInstance().hasFreezable(this.getStackInSlot(0)) && AetherAPI.getInstance().getFreezable(this.getStackInSlot(0)).equals(this.currentFreezable))
{
this.currentFreezable = null;
this.freezeProgress = 0;
@ -98,9 +98,9 @@ public class TileEntityFreezer extends AetherTileEntity
AetherHooks.onItemFreeze(this, this.currentFreezable);
}
if (this.frozenTimeRemaining <= 0 && AetherRegistry.getInstance().isFreezableFuel(this.getStackInSlot(1)))
if (this.frozenTimeRemaining <= 0 && AetherAPI.getInstance().isFreezableFuel(this.getStackInSlot(1)))
{
this.frozenTimeRemaining += AetherRegistry.getInstance().getFreezableFuel(this.getStackInSlot(1)).getTimeGiven();
this.frozenTimeRemaining += AetherAPI.getInstance().getFreezableFuel(this.getStackInSlot(1)).getTimeGiven();
if (!this.worldObj.isRemote)
{
@ -111,7 +111,7 @@ public class TileEntityFreezer extends AetherTileEntity
else if (this.getStackInSlot(0) != null)
{
ItemStack itemstack = this.getStackInSlot(0);
AetherFreezable freezable = AetherRegistry.getInstance().getFreezable(itemstack);
AetherFreezable freezable = AetherAPI.getInstance().getFreezable(itemstack);
if (this.getStackInSlot(2) == null || freezable.getOutput().getItem() == this.getStackInSlot(2).getItem() && freezable.getOutput().getMetadata() == this.getStackInSlot(2).getMetadata())
{
@ -289,11 +289,11 @@ public class TileEntityFreezer extends AetherTileEntity
{
if (stackInSlot != null)
{
if (AetherRegistry.getInstance().hasFreezable(stackInSlot))
if (AetherAPI.getInstance().hasFreezable(stackInSlot))
{
return true;
}
else if (slot == 1 && AetherRegistry.getInstance().isFreezableFuel(stackInSlot))
else if (slot == 1 && AetherAPI.getInstance().isFreezableFuel(stackInSlot))
{
return true;
}

2
src/main/java/com/legacy/aether/tile_entities/TileEntityIncubator.java
View file

@ -12,9 +12,9 @@ import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import com.legacy.aether.api.events.AetherHooks;
import com.legacy.aether.blocks.BlocksAether;
import com.legacy.aether.entities.passive.mountable.EntityMoa;
import com.legacy.aether.events.AetherHooks;
import com.legacy.aether.items.ItemMoaEgg;
import com.legacy.aether.items.ItemsAether;
import com.legacy.aether.registry.achievements.AchievementsAether;

6
src/main/java/com/legacy/aether/universal/jei/AetherJEIPlugin.java
View file

@ -8,7 +8,7 @@ import mezz.jei.api.JEIPlugin;
import mezz.jei.api.ingredients.IModIngredientRegistration;
import net.minecraft.item.ItemStack;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.blocks.BlocksAether;
import com.legacy.aether.universal.jei.category.EnchanterRecipeCategory;
import com.legacy.aether.universal.jei.category.FreezerRecipeCategory;
@ -42,8 +42,8 @@ public class AetherJEIPlugin implements IModPlugin
registry.addRecipeCategoryCraftingItem(new ItemStack(BlocksAether.enchanter), "aether_legacy.enchantment");
registry.addRecipeCategoryCraftingItem(new ItemStack(BlocksAether.freezer), "aether_legacy.freezable");
registry.addRecipes(AetherRegistry.getInstance().getEnchantmentValues());
registry.addRecipes(AetherRegistry.getInstance().getFreezableValues());
registry.addRecipes(AetherAPI.getInstance().getEnchantmentValues());
registry.addRecipes(AetherAPI.getInstance().getFreezableValues());
}
@Override

4
src/main/java/com/legacy/aether/universal/jei/wrapper/EnchanterRecipeWrapper.java
View file

@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import com.google.common.collect.Lists;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.api.enchantments.AetherEnchantment;
public class EnchanterRecipeWrapper implements IRecipeWrapper
@ -30,7 +30,7 @@ public class EnchanterRecipeWrapper implements IRecipeWrapper
this.outputs = Lists.newArrayList();
for (AetherEnchantment enchantment : AetherRegistry.getInstance().getEnchantmentValues())
for (AetherEnchantment enchantment : AetherAPI.getInstance().getEnchantmentValues())
{
this.inputs.add(enchantment.getInput());
this.outputs.add(enchantment.getOutput());

4
src/main/java/com/legacy/aether/universal/jei/wrapper/FreezerRecipeWrapper.java
View file

@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import com.google.common.collect.Lists;
import com.legacy.aether.api.AetherRegistry;
import com.legacy.aether.api.AetherAPI;
import com.legacy.aether.api.freezables.AetherFreezable;
public class FreezerRecipeWrapper implements IRecipeWrapper
@ -29,7 +29,7 @@ public class FreezerRecipeWrapper implements IRecipeWrapper
this.inputs = Lists.newArrayList();
this.outputs = Lists.newArrayList();
for (AetherFreezable freezable : AetherRegistry.getInstance().getFreezableValues())
for (AetherFreezable freezable : AetherAPI.getInstance().getFreezableValues())
{
this.inputs.add(freezable.getInput());
this.outputs.add(freezable.getOutput());