Browse Source

Fixed JAR builds not including the Aether API, added some API javadoc

labyrinth
Collin1971 4 years ago
parent
commit
227b9ccc0b
79 changed files with 321 additions and 265 deletions
  1. +12
    -1
      build.gradle
  2. +2
    -2
      settings.gradle
  3. +0
    -11
      src/api/java/com/gildedgames/aether/IAetherServices.java
  4. +3
    -3
      src/api/java/com/gildedgames/aether/api/AetherAPI.java
  5. +11
    -0
      src/api/java/com/gildedgames/aether/api/IAetherServices.java
  6. +4
    -4
      src/api/java/com/gildedgames/aether/api/capabilites/AetherCapabilities.java
  7. +14
    -1
      src/api/java/com/gildedgames/aether/api/entities/effects/EntityEffectInstance.java
  8. +1
    -1
      src/api/java/com/gildedgames/aether/api/entities/effects/EntityEffectProcessor.java
  9. +1
    -1
      src/api/java/com/gildedgames/aether/api/entities/effects/EntityEffectRule.java
  10. +15
    -0
      src/api/java/com/gildedgames/aether/api/items/IItemEffectsCapability.java
  11. +32
    -0
      src/api/java/com/gildedgames/aether/api/items/IItemPropertiesCapability.java
  12. +1
    -1
      src/api/java/com/gildedgames/aether/api/items/properties/ItemEquipmentType.java
  13. +1
    -3
      src/api/java/com/gildedgames/aether/api/items/properties/ItemRarity.java
  14. +6
    -2
      src/api/java/com/gildedgames/aether/api/player/IPlayerAetherCapability.java
  15. +3
    -3
      src/api/java/com/gildedgames/aether/api/player/inventory/IInventoryEquipment.java
  16. +32
    -0
      src/api/java/com/gildedgames/aether/api/registry/altar/IAltarRecipe.java
  17. +20
    -0
      src/api/java/com/gildedgames/aether/api/registry/altar/IAltarRecipeRegistry.java
  18. +11
    -0
      src/api/java/com/gildedgames/aether/api/registry/equipment/IEquipmentProperties.java
  19. +26
    -0
      src/api/java/com/gildedgames/aether/api/registry/equipment/IEquipmentRegistry.java
  20. +0
    -12
      src/api/java/com/gildedgames/aether/items/IItemEffectsCapability.java
  21. +0
    -19
      src/api/java/com/gildedgames/aether/items/IItemPropertiesCapability.java
  22. +0
    -12
      src/api/java/com/gildedgames/aether/registry/altar/IAltarRecipe.java
  23. +0
    -10
      src/api/java/com/gildedgames/aether/registry/altar/IAltarRecipeRegistry.java
  24. +0
    -14
      src/api/java/com/gildedgames/aether/registry/equipment/IEquipmentProperties.java
  25. +0
    -12
      src/api/java/com/gildedgames/aether/registry/equipment/IEquipmentRegistry.java
  26. +1
    -1
      src/main/java/com/gildedgames/aether/client/ClientEventHandler.java
  27. +2
    -2
      src/main/java/com/gildedgames/aether/client/gui/container/GuiEquipment.java
  28. +1
    -1
      src/main/java/com/gildedgames/aether/client/models/entities/player/LayerPlayerGloves.java
  29. +1
    -1
      src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderPlayerHelper.java
  30. +1
    -1
      src/main/java/com/gildedgames/aether/client/sound/AetherMusicManager.java
  31. +1
    -1
      src/main/java/com/gildedgames/aether/client/sound/generators/AetherMusicGenerator.java
  32. +1
    -1
      src/main/java/com/gildedgames/aether/client/sound/generators/IMusicGenerator.java
  33. +8
    -8
      src/main/java/com/gildedgames/aether/common/AetherCapabilityManager.java
  34. +3
    -3
      src/main/java/com/gildedgames/aether/common/AetherCore.java
  35. +3
    -6
      src/main/java/com/gildedgames/aether/common/CommonProxy.java
  36. +8
    -8
      src/main/java/com/gildedgames/aether/common/containers/ContainerEquipment.java
  37. +9
    -9
      src/main/java/com/gildedgames/aether/common/containers/inventory/InventoryEquipment.java
  38. +3
    -3
      src/main/java/com/gildedgames/aether/common/containers/slots/SlotEquipment.java
  39. +2
    -2
      src/main/java/com/gildedgames/aether/common/entities/effects/AbstractEffectProcessor.java
  40. +3
    -3
      src/main/java/com/gildedgames/aether/common/entities/effects/EffectPool.java
  41. +2
    -2
      src/main/java/com/gildedgames/aether/common/entities/effects/EffectProcessorPlayer.java
  42. +2
    -2
      src/main/java/com/gildedgames/aether/common/entities/effects/EntityEffects.java
  43. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/processors/BreatheUnderwaterEffect.java
  44. +3
    -3
      src/main/java/com/gildedgames/aether/common/entities/effects/processors/DoubleDropEffect.java
  45. +3
    -3
      src/main/java/com/gildedgames/aether/common/entities/effects/processors/FreezeBlocksEffect.java
  46. +3
    -3
      src/main/java/com/gildedgames/aether/common/entities/effects/processors/ModifyDamageEffect.java
  47. +3
    -3
      src/main/java/com/gildedgames/aether/common/entities/effects/processors/ModifyMaxHealthEffect.java
  48. +3
    -3
      src/main/java/com/gildedgames/aether/common/entities/effects/processors/ModifySpeedEffect.java
  49. +2
    -2
      src/main/java/com/gildedgames/aether/common/entities/effects/processors/RegenerateHealthEffect.java
  50. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/processors/player/DaggerfrostEffect.java
  51. +2
    -2
      src/main/java/com/gildedgames/aether/common/entities/effects/processors/player/ModifyXPCollectionEffect.java
  52. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/processors/player/PauseHungerEffect.java
  53. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/rules/DamagingMobRule.java
  54. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/rules/DamagingUndeadRule.java
  55. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/rules/HoldingItemRule.java
  56. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/rules/InBiomeRule.java
  57. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/rules/InCombatRule.java
  58. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/rules/InDimensionRule.java
  59. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/rules/InDirectMoonlightRule.java
  60. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/rules/InDirectSunlightRule.java
  61. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/rules/OnGroundRule.java
  62. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/rules/OutOfCombatRule.java
  63. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/rules/UndergroundRule.java
  64. +1
    -1
      src/main/java/com/gildedgames/aether/common/entities/effects/rules/WearingItemsRule.java
  65. +5
    -6
      src/main/java/com/gildedgames/aether/common/items/ItemsAether.java
  66. +3
    -3
      src/main/java/com/gildedgames/aether/common/items/effects/ItemEffects.java
  67. +4
    -4
      src/main/java/com/gildedgames/aether/common/items/effects/ItemEffectsProvider.java
  68. +6
    -15
      src/main/java/com/gildedgames/aether/common/items/properties/EquipmentRegistry.java
  69. +5
    -19
      src/main/java/com/gildedgames/aether/common/items/properties/ItemProperties.java
  70. +3
    -3
      src/main/java/com/gildedgames/aether/common/items/properties/ItemPropertiesProvider.java
  71. +3
    -3
      src/main/java/com/gildedgames/aether/common/player/PlayerAether.java
  72. +1
    -1
      src/main/java/com/gildedgames/aether/common/player/PlayerAetherEvents.java
  73. +2
    -2
      src/main/java/com/gildedgames/aether/common/player/PlayerAetherProvider.java
  74. +2
    -2
      src/main/java/com/gildedgames/aether/common/recipes/AltarRegistry.java
  75. +2
    -2
      src/main/java/com/gildedgames/aether/common/recipes/RecipesAether.java
  76. +2
    -2
      src/main/java/com/gildedgames/aether/common/recipes/altar/AltarEnchantRecipe.java
  77. +2
    -2
      src/main/java/com/gildedgames/aether/common/recipes/altar/AltarRepairRecipe.java
  78. +1
    -1
      src/main/java/com/gildedgames/aether/common/tile_entities/TileEntityAltar.java
  79. +0
    -0
      src/main/resources/assets/LICENSE

+ 12
- 1
build.gradle View File

@@ -35,8 +35,19 @@ if (ciVersion != null) {
version = "${config.mod_version}.git-${gitVersion}"
}

sourceSets {
api {
java { srcDir "src/api/java" }
}
}

dependencies {
compile project(":Gilded-Games-Util")
compile project(":gilded-games-util")
}

jar {
from sourceSets.api.output
from sourceSets.main.output
}

minecraft {


+ 2
- 2
settings.gradle View File

@@ -1,5 +1,5 @@
include ':Gilded-Games-Util'
include ':gilded-games-util'

project(":Gilded-Games-Util").projectDir = file("modules/Gilded-Games-Util")
project(":gilded-games-util").projectDir = file("modules/Gilded-Games-Util")

rootProject.name = 'AetherII'

+ 0
- 11
src/api/java/com/gildedgames/aether/IAetherServices.java View File

@@ -1,11 +0,0 @@
package com.gildedgames.aether;

import com.gildedgames.aether.registry.altar.IAltarRecipeRegistry;
import com.gildedgames.aether.registry.equipment.IEquipmentRegistry;

public interface IAetherServices
{
IAltarRecipeRegistry getAltarRecipeRegistry();

IEquipmentRegistry getEquipmentRegistry();
}

src/api/java/com/gildedgames/aether/AetherAPI.java → src/api/java/com/gildedgames/aether/api/AetherAPI.java View File

@@ -1,7 +1,7 @@
package com.gildedgames.aether;
package com.gildedgames.aether.api;

import com.gildedgames.aether.registry.altar.IAltarRecipeRegistry;
import com.gildedgames.aether.registry.equipment.IEquipmentRegistry;
import com.gildedgames.aether.api.registry.altar.IAltarRecipeRegistry;
import com.gildedgames.aether.api.registry.equipment.IEquipmentRegistry;

public class AetherAPI
{

+ 11
- 0
src/api/java/com/gildedgames/aether/api/IAetherServices.java View File

@@ -0,0 +1,11 @@
package com.gildedgames.aether.api;

import com.gildedgames.aether.api.registry.altar.IAltarRecipeRegistry;
import com.gildedgames.aether.api.registry.equipment.IEquipmentRegistry;

public interface IAetherServices
{
IAltarRecipeRegistry getAltarRecipeRegistry();

IEquipmentRegistry getEquipmentRegistry();
}

src/api/java/com/gildedgames/aether/capabilites/AetherCapabilities.java → src/api/java/com/gildedgames/aether/api/capabilites/AetherCapabilities.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.capabilites;
package com.gildedgames.aether.api.capabilites;

import com.gildedgames.aether.items.IItemEffectsCapability;
import com.gildedgames.aether.items.IItemPropertiesCapability;
import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.items.IItemEffectsCapability;
import com.gildedgames.aether.api.items.IItemPropertiesCapability;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;


src/api/java/com/gildedgames/aether/entities/effects/EntityEffectInstance.java → src/api/java/com/gildedgames/aether/api/entities/effects/EntityEffectInstance.java View File

@@ -1,7 +1,10 @@
package com.gildedgames.aether.entities.effects;
package com.gildedgames.aether.api.entities.effects;

import net.minecraft.nbt.NBTTagCompound;

/**
* An instance of an {@link EntityEffectProcessor} containing the item's special characteristics.
*/
public class EntityEffectInstance
{
private final EntityEffectRule[] rules;
@@ -14,16 +17,26 @@ public class EntityEffectInstance
this.attributes = new NBTTagCompound();
}

/**
* @return A list of rules required to activate the corresponding {@link EntityEffectProcessor}.
*/
public EntityEffectRule[] getRules()
{
return this.rules;
}

/**
* @return The {@link NBTTagCompound} containing custom traits of the item's effects.
*/
public NBTTagCompound getAttributes()
{
return this.attributes;
}

/**
* Used internally to clone special traits.
* @return A clone of this instance.
*/
public EntityEffectInstance cloneInstance()
{
return new EntityEffectInstance(this.getRules());

src/api/java/com/gildedgames/aether/entities/effects/EntityEffectProcessor.java → src/api/java/com/gildedgames/aether/api/entities/effects/EntityEffectProcessor.java View File

@@ -1,4 +1,4 @@
package com.gildedgames.aether.entities.effects;
package com.gildedgames.aether.api.entities.effects;

import net.minecraft.entity.Entity;
import net.minecraftforge.event.entity.living.LivingDropsEvent;

src/api/java/com/gildedgames/aether/entities/effects/EntityEffectRule.java → src/api/java/com/gildedgames/aether/api/entities/effects/EntityEffectRule.java View File

@@ -1,4 +1,4 @@
package com.gildedgames.aether.entities.effects;
package com.gildedgames.aether.api.entities.effects;

import net.minecraft.entity.Entity;
import net.minecraftforge.event.entity.living.LivingHurtEvent;

+ 15
- 0
src/api/java/com/gildedgames/aether/api/items/IItemEffectsCapability.java View File

@@ -0,0 +1,15 @@
package com.gildedgames.aether.api.items;

import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import org.apache.commons.lang3.tuple.Pair;

import java.util.List;

public interface IItemEffectsCapability
{
/**
* @return A list containing the effects the item tied to this capability will give an entity.
*/
List<Pair<EntityEffectProcessor, EntityEffectInstance>> getEffectPairs();
}

+ 32
- 0
src/api/java/com/gildedgames/aether/api/items/IItemPropertiesCapability.java View File

@@ -0,0 +1,32 @@
package com.gildedgames.aether.api.items;

import com.gildedgames.aether.api.items.properties.ItemEquipmentType;
import com.gildedgames.aether.api.items.properties.ItemRarity;
import com.gildedgames.aether.api.registry.equipment.IEquipmentProperties;
import net.minecraft.item.ItemStack;

/**
* A special capability used to add equipment properties to ItemStacks.
*/
public interface IItemPropertiesCapability
{
IEquipmentProperties getProperties();

/**
* Helper method for {@link IEquipmentProperties#getRarity()}
* @return The rarity of this {@link ItemStack}'s item.
*/
ItemRarity getRarity();

/**
* Helper method for {@link IEquipmentProperties#getEquipmentType()}
* @return The equipment type of this {@link ItemStack}'s item.
*/
ItemEquipmentType getEquipmentType();

/**
* Helper method to determine whether or not this item can be equipped.
* @return True if the item can be equipped, otherwise false if there's no properties registered.
*/
boolean isEquippable();
}

src/api/java/com/gildedgames/aether/items/properties/ItemEquipmentType.java → src/api/java/com/gildedgames/aether/api/items/properties/ItemEquipmentType.java View File

@@ -1,4 +1,4 @@
package com.gildedgames.aether.items.properties;
package com.gildedgames.aether.api.items.properties;

public enum ItemEquipmentType
{

src/api/java/com/gildedgames/aether/items/properties/ItemRarity.java → src/api/java/com/gildedgames/aether/api/items/properties/ItemRarity.java View File

@@ -1,8 +1,7 @@
package com.gildedgames.aether.items.properties;
package com.gildedgames.aether.api.items.properties;

public enum ItemRarity
{

NONE("", 1.0F),
COMMON("item.rarity.common.name", 1.0F),
RARE("item.rarity.rare.name", 1.0F),
@@ -29,5 +28,4 @@ public enum ItemRarity
{
return this.weight;
}

}

src/api/java/com/gildedgames/aether/player/IPlayerAetherCapability.java → src/api/java/com/gildedgames/aether/api/player/IPlayerAetherCapability.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.player;
package com.gildedgames.aether.api.player;

import com.gildedgames.aether.player.inventory.IInventoryEquipment;
import com.gildedgames.aether.api.player.inventory.IInventoryEquipment;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
@@ -11,6 +11,8 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent;

public interface IPlayerAetherCapability
{
// [--- Event handlers for the entity this capability is attached to. ---]

void onUpdate(LivingUpdateEvent event);

void onDeath(LivingDeathEvent event);
@@ -23,6 +25,8 @@ public interface IPlayerAetherCapability

void onJump(LivingJumpEvent event);

// [--- End of event handlers. ---]

IInventoryEquipment getEquipmentInventory();

/**

src/api/java/com/gildedgames/aether/player/inventory/IInventoryEquipment.java → src/api/java/com/gildedgames/aether/api/player/inventory/IInventoryEquipment.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.player.inventory;
package com.gildedgames.aether.api.player.inventory;

import com.gildedgames.aether.items.properties.ItemEquipmentType;
import com.gildedgames.aether.api.items.properties.ItemEquipmentType;
import com.gildedgames.util.core.nbt.NBT;
import net.minecraft.inventory.IInventory;

@@ -10,7 +10,7 @@ public interface IInventoryEquipment extends IInventory, NBT
* Returns the slot ID of the first available inventory slot for equipment of {@param type}.
*
* @param type The slot type to search for
* @return A positive integer corresponding to next available inventory slot.
* @return A positive integer corresponding to next available inventory slot. Returns -1 if there are no eligible slots.
*/
int getNextEmptySlotForType(ItemEquipmentType type);
}

+ 32
- 0
src/api/java/com/gildedgames/aether/api/registry/altar/IAltarRecipe.java View File

@@ -0,0 +1,32 @@
package com.gildedgames.aether.api.registry.altar;

import net.minecraft.item.ItemStack;

public interface IAltarRecipe
{
/**
* Used internally by the Altar to search for matching recipes.
*
* @param stack The {@link ItemStack} on the Altar.
* @return True if this recipe accepts this item.
*/
boolean matchesRecipe(ItemStack stack);

/**
* Used internally to determine how much Ambrosium this recipe will use upon completion with
* the {@param stack}.
*
* @param stack The {@link ItemStack} on the Altar.
* @return The amount of Ambrosium the Altar should consume when this recipe is completed.
*/
int getAmbrosiumCost(ItemStack stack);

/**
* Returns the output {@link ItemStack} this recipe will create upon completion with the
* {@param stack}.
*
* @param stack The {@link ItemStack} on the Altar.
* @return The output of this recipe when completed.
*/
ItemStack getOutput(ItemStack stack);
}

+ 20
- 0
src/api/java/com/gildedgames/aether/api/registry/altar/IAltarRecipeRegistry.java View File

@@ -0,0 +1,20 @@
package com.gildedgames.aether.api.registry.altar;

import net.minecraft.item.ItemStack;

public interface IAltarRecipeRegistry
{
/**
* Registers a simple input/output recipe.
* @param input The {@link ItemStack} that this recipe requires
* @param output The {@link ItemStack} this recipe will return upon being completed
* @param cost How much Ambrosium will be required to complete the recipe
*/
void registerAltarEnchantment(ItemStack input, ItemStack output, int cost);

/**
* Registers an {@link IAltarRecipe} with the registry.
* @param recipe The recipe to register
*/
void registerAltarRecipe(IAltarRecipe recipe);
}

+ 11
- 0
src/api/java/com/gildedgames/aether/api/registry/equipment/IEquipmentProperties.java View File

@@ -0,0 +1,11 @@
package com.gildedgames.aether.api.registry.equipment;

import com.gildedgames.aether.api.items.properties.ItemEquipmentType;
import com.gildedgames.aether.api.items.properties.ItemRarity;

public interface IEquipmentProperties
{
ItemEquipmentType getEquipmentType();

ItemRarity getRarity();
}

+ 26
- 0
src/api/java/com/gildedgames/aether/api/registry/equipment/IEquipmentRegistry.java View File

@@ -0,0 +1,26 @@
package com.gildedgames.aether.api.registry.equipment;

import com.gildedgames.aether.api.items.properties.ItemEquipmentType;
import com.gildedgames.aether.api.items.properties.ItemRarity;
import net.minecraft.item.Item;

import javax.annotation.Nullable;

public interface IEquipmentRegistry
{
/**
* Creates and assigns equipment properties to an item.
* @param item The item to assign to
* @param rarity The rarity of the item
* @param type The equipment type of the item
*/
void register(Item item, ItemRarity rarity, ItemEquipmentType type);

/**
* Returns the equipment properties of an item.
* @param item The item
* @return The item's registered {@link IEquipmentProperties}. Returns null if properties are not assigned to the item.
*/
@Nullable
IEquipmentProperties getProperties(Item item);
}

+ 0
- 12
src/api/java/com/gildedgames/aether/items/IItemEffectsCapability.java View File

@@ -1,12 +0,0 @@
package com.gildedgames.aether.items;

import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import org.apache.commons.lang3.tuple.Pair;

import java.util.List;

public interface IItemEffectsCapability
{
List<Pair<EntityEffectProcessor, EntityEffectInstance>> getEffectPairs();
}

+ 0
- 19
src/api/java/com/gildedgames/aether/items/IItemPropertiesCapability.java View File

@@ -1,19 +0,0 @@
package com.gildedgames.aether.items;

import com.gildedgames.aether.items.properties.ItemEquipmentType;
import com.gildedgames.aether.items.properties.ItemRarity;
import com.gildedgames.aether.registry.equipment.IEquipmentProperties;
import net.minecraft.item.ItemStack;

public interface IItemPropertiesCapability
{
IEquipmentProperties getProperties();

ItemRarity getRarity();

ItemEquipmentType getEquipmentType();

ItemStack getStack();

boolean isEquippable();
}

+ 0
- 12
src/api/java/com/gildedgames/aether/registry/altar/IAltarRecipe.java View File

@@ -1,12 +0,0 @@
package com.gildedgames.aether.registry.altar;

import net.minecraft.item.ItemStack;

public interface IAltarRecipe
{
boolean matchesItem(ItemStack stack);

int getAmbrosiumCost(ItemStack stack);

ItemStack getOutput(ItemStack stack);
}

+ 0
- 10
src/api/java/com/gildedgames/aether/registry/altar/IAltarRecipeRegistry.java View File

@@ -1,10 +0,0 @@
package com.gildedgames.aether.registry.altar;

import net.minecraft.item.ItemStack;

public interface IAltarRecipeRegistry
{
void registerAltarEnchantment(ItemStack input, ItemStack output, int cost);

void registerAltarRecipe(IAltarRecipe recipe);
}

+ 0
- 14
src/api/java/com/gildedgames/aether/registry/equipment/IEquipmentProperties.java View File

@@ -1,14 +0,0 @@
package com.gildedgames.aether.registry.equipment;

import com.gildedgames.aether.items.properties.ItemEquipmentType;
import com.gildedgames.aether.items.properties.ItemRarity;
import net.minecraft.item.Item;

public interface IEquipmentProperties
{
Item getItem();

ItemEquipmentType getEquipmentType();

ItemRarity getRarity();
}

+ 0
- 12
src/api/java/com/gildedgames/aether/registry/equipment/IEquipmentRegistry.java View File

@@ -1,12 +0,0 @@
package com.gildedgames.aether.registry.equipment;

import com.gildedgames.aether.items.properties.ItemEquipmentType;
import com.gildedgames.aether.items.properties.ItemRarity;
import net.minecraft.item.Item;

public interface IEquipmentRegistry
{
void register(Item item, ItemRarity rarity, ItemEquipmentType type);

IEquipmentProperties getProperties(Item item);
}

+ 1
- 1
src/main/java/com/gildedgames/aether/client/ClientEventHandler.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.client;
import com.gildedgames.aether.client.sound.AetherMusicManager;
import com.gildedgames.aether.common.containers.slots.SlotEquipment;
import com.gildedgames.aether.common.player.PlayerAether;
import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import com.gildedgames.aether.common.items.armor.ItemObsidianArmor;
import com.gildedgames.aether.common.util.PlayerUtil;
import net.minecraft.client.Minecraft;


+ 2
- 2
src/main/java/com/gildedgames/aether/client/gui/container/GuiEquipment.java View File

@@ -2,8 +2,8 @@ package com.gildedgames.aether.client.gui.container;

import com.gildedgames.aether.common.containers.ContainerEquipment;
import com.gildedgames.aether.common.containers.slots.SlotEquipment;
import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.items.properties.ItemEquipmentType;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.items.properties.ItemEquipmentType;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.gui.inventory.GuiInventory;
import net.minecraft.client.renderer.GlStateManager;


+ 1
- 1
src/main/java/com/gildedgames/aether/client/models/entities/player/LayerPlayerGloves.java View File

@@ -1,7 +1,7 @@
package com.gildedgames.aether.client.models.entities.player;

import com.gildedgames.aether.common.player.PlayerAether;
import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import com.gildedgames.aether.common.items.armor.ItemAetherGloves;
import com.gildedgames.aether.common.items.armor.ItemLeatherGloves;
import net.minecraft.client.model.ModelBiped;


+ 1
- 1
src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderPlayerHelper.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.client.renderer.entities.living;

import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import com.gildedgames.aether.common.items.armor.ItemAetherGloves;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.ModelBiped;


+ 1
- 1
src/main/java/com/gildedgames/aether/client/sound/AetherMusicManager.java View File

@@ -1,7 +1,7 @@
package com.gildedgames.aether.client.sound;

import com.gildedgames.aether.client.sound.generators.IMusicGenerator;
import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.ISound;
import net.minecraft.client.audio.PositionedSoundRecord;


+ 1
- 1
src/main/java/com/gildedgames/aether/client/sound/generators/AetherMusicGenerator.java View File

@@ -1,7 +1,7 @@
package com.gildedgames.aether.client.sound.generators;

import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;



+ 1
- 1
src/main/java/com/gildedgames/aether/client/sound/generators/IMusicGenerator.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.client.sound.generators;

import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import net.minecraft.util.ResourceLocation;

public interface IMusicGenerator


+ 8
- 8
src/main/java/com/gildedgames/aether/common/AetherCapabilityManager.java View File

@@ -1,19 +1,19 @@
package com.gildedgames.aether.common;

import com.gildedgames.aether.capabilites.AetherCapabilities;
import com.gildedgames.aether.api.capabilites.AetherCapabilities;
import com.gildedgames.aether.common.items.effects.ItemEffects;
import com.gildedgames.aether.common.items.effects.ItemEffectsProvider;
import com.gildedgames.aether.common.items.properties.ItemProperties;
import com.gildedgames.aether.common.items.properties.ItemPropertiesProvider;
import com.gildedgames.aether.common.player.PlayerAether;
import com.gildedgames.aether.common.player.PlayerAetherProvider;
import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.items.properties.ItemRarity;
import com.gildedgames.aether.items.IItemEffectsCapability;
import com.gildedgames.aether.items.IItemPropertiesCapability;
import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.items.properties.ItemRarity;
import com.gildedgames.aether.api.items.IItemEffectsCapability;
import com.gildedgames.aether.api.items.IItemPropertiesCapability;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;


+ 3
- 3
src/main/java/com/gildedgames/aether/common/AetherCore.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.common;

import com.gildedgames.aether.IAetherServices;
import com.gildedgames.aether.registry.equipment.IEquipmentRegistry;
import com.gildedgames.aether.registry.altar.IAltarRecipeRegistry;
import com.gildedgames.aether.api.IAetherServices;
import com.gildedgames.aether.api.registry.equipment.IEquipmentRegistry;
import com.gildedgames.aether.api.registry.altar.IAltarRecipeRegistry;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.Mod;


+ 3
- 6
src/main/java/com/gildedgames/aether/common/CommonProxy.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common;

import com.gildedgames.aether.AetherAPI;
import com.gildedgames.aether.api.AetherAPI;
import com.gildedgames.aether.client.gui.tab.TabEquipment;
import com.gildedgames.aether.common.blocks.BlocksAether;
import com.gildedgames.aether.common.entities.EntitiesAether;
@@ -15,17 +15,14 @@ import com.gildedgames.aether.common.tile_entities.TileEntitiesAether;
import com.gildedgames.aether.common.world.WorldProviderAether;
import com.gildedgames.aether.common.world.chunk.PlacementFlagFactory;
import com.gildedgames.aether.common.world.dungeon.DungeonInstance;
import com.gildedgames.aether.items.properties.ItemEquipmentType;
import com.gildedgames.aether.items.properties.ItemRarity;
import com.gildedgames.aether.registry.altar.IAltarRecipeRegistry;
import com.gildedgames.aether.api.items.properties.ItemEquipmentType;
import com.gildedgames.aether.api.items.properties.ItemRarity;
import com.gildedgames.util.io.Instantiator;
import com.gildedgames.util.modules.chunk.ChunkModule;
import com.gildedgames.util.modules.tab.TabModule;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;


+ 8
- 8
src/main/java/com/gildedgames/aether/common/containers/ContainerEquipment.java View File

@@ -1,15 +1,15 @@
package com.gildedgames.aether.common.containers;

import com.gildedgames.aether.capabilites.AetherCapabilities;
import com.gildedgames.aether.api.capabilites.AetherCapabilities;
import com.gildedgames.aether.common.containers.slots.SlotEquipment;
import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.common.entities.effects.EntityEffects;
import com.gildedgames.aether.items.properties.ItemEquipmentType;
import com.gildedgames.aether.items.IItemEffectsCapability;
import com.gildedgames.aether.items.IItemPropertiesCapability;
import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.player.inventory.IInventoryEquipment;
import com.gildedgames.aether.api.items.properties.ItemEquipmentType;
import com.gildedgames.aether.api.items.IItemEffectsCapability;
import com.gildedgames.aether.api.items.IItemPropertiesCapability;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.player.inventory.IInventoryEquipment;
import net.minecraft.client.gui.inventory.GuiContainerCreative;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ContainerPlayer;


+ 9
- 9
src/main/java/com/gildedgames/aether/common/containers/inventory/InventoryEquipment.java View File

@@ -1,13 +1,13 @@
package com.gildedgames.aether.common.containers.inventory;

import com.gildedgames.aether.capabilites.AetherCapabilities;
import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.capabilites.AetherCapabilities;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.common.entities.effects.EntityEffects;
import com.gildedgames.aether.items.properties.ItemEquipmentType;
import com.gildedgames.aether.items.IItemEffectsCapability;
import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.player.inventory.IInventoryEquipment;
import com.gildedgames.aether.api.items.properties.ItemEquipmentType;
import com.gildedgames.aether.api.items.IItemEffectsCapability;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.player.inventory.IInventoryEquipment;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -302,13 +302,13 @@ public class InventoryEquipment implements IInventoryEquipment
}
}

output.setTag("accessoriesInventory", list);
output.setTag("items", list);
}

@Override
public void read(NBTTagCompound input)
{
NBTTagList list = input.getTagList("accessoriesInventory", 10);
NBTTagList list = input.getTagList("items", 10);

if (list != null)
{


+ 3
- 3
src/main/java/com/gildedgames/aether/common/containers/slots/SlotEquipment.java View File

@@ -1,9 +1,9 @@
package com.gildedgames.aether.common.containers.slots;

import com.gildedgames.aether.capabilites.AetherCapabilities;
import com.gildedgames.aether.api.capabilites.AetherCapabilities;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.items.properties.ItemEquipmentType;
import com.gildedgames.aether.items.IItemPropertiesCapability;
import com.gildedgames.aether.api.items.properties.ItemEquipmentType;
import com.gildedgames.aether.api.items.IItemPropertiesCapability;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;


+ 2
- 2
src/main/java/com/gildedgames/aether/common/entities/effects/AbstractEffectProcessor.java View File

@@ -1,7 +1,7 @@
package com.gildedgames.aether.common.entities.effects;

import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import net.minecraft.entity.Entity;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.event.entity.living.LivingHurtEvent;


+ 3
- 3
src/main/java/com/gildedgames/aether/common/entities/effects/EffectPool.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.common.entities.effects;

import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import com.google.common.collect.Lists;
import net.minecraft.entity.Entity;
import net.minecraftforge.event.entity.living.LivingDropsEvent;


+ 2
- 2
src/main/java/com/gildedgames/aether/common/entities/effects/EffectProcessorPlayer.java View File

@@ -1,7 +1,7 @@
package com.gildedgames.aether.common.entities.effects;

import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.entity.player.PlayerPickupXpEvent;


+ 2
- 2
src/main/java/com/gildedgames/aether/common/entities/effects/EntityEffects.java View File

@@ -10,8 +10,8 @@ import com.gildedgames.aether.common.entities.effects.processors.RegenerateHealt
import com.gildedgames.aether.common.entities.effects.processors.player.DaggerfrostEffect;
import com.gildedgames.aether.common.entities.effects.processors.player.ModifyXPCollectionEffect;
import com.gildedgames.aether.common.entities.effects.processors.player.PauseHungerEffect;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.util.modules.entityhook.api.IEntityHookFactory;
import com.gildedgames.util.modules.entityhook.impl.hooks.EntityHook;
import com.gildedgames.util.modules.entityhook.impl.providers.LivingHookProvider;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/processors/BreatheUnderwaterEffect.java View File

@@ -1,7 +1,7 @@
package com.gildedgames.aether.common.entities.effects.processors;

import com.gildedgames.aether.common.entities.effects.AbstractEffectProcessor;
import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import net.minecraft.entity.Entity;

import java.util.List;


+ 3
- 3
src/main/java/com/gildedgames/aether/common/entities/effects/processors/DoubleDropEffect.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.common.entities.effects.processors;

import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import com.gildedgames.aether.common.entities.effects.processors.DoubleDropEffect.Instance;
import com.gildedgames.aether.common.items.weapons.swords.ItemSkyrootSword;
import net.minecraft.entity.Entity;


+ 3
- 3
src/main/java/com/gildedgames/aether/common/entities/effects/processors/FreezeBlocksEffect.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.common.entities.effects.processors;

import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import com.gildedgames.aether.common.entities.effects.processors.FreezeBlocksEffect.Instance;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;


+ 3
- 3
src/main/java/com/gildedgames/aether/common/entities/effects/processors/ModifyDamageEffect.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.common.entities.effects.processors;

import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import com.gildedgames.aether.common.entities.effects.processors.ModifyDamageEffect.Instance;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;


+ 3
- 3
src/main/java/com/gildedgames/aether/common/entities/effects/processors/ModifyMaxHealthEffect.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.common.entities.effects.processors;

import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import com.gildedgames.aether.common.entities.effects.processors.ModifyMaxHealthEffect.Instance;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;


+ 3
- 3
src/main/java/com/gildedgames/aether/common/entities/effects/processors/ModifySpeedEffect.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.common.entities.effects.processors;

import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import com.gildedgames.aether.common.entities.effects.processors.ModifySpeedEffect.Instance;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;


+ 2
- 2
src/main/java/com/gildedgames/aether/common/entities/effects/processors/RegenerateHealthEffect.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.common.entities.effects.processors;

import com.gildedgames.aether.common.entities.effects.AbstractEffectProcessor;
import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import com.gildedgames.aether.common.entities.effects.processors.RegenerateHealthEffect.Instance;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/processors/player/DaggerfrostEffect.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.processors.player;

import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.common.entities.effects.EffectProcessorPlayer;
import com.gildedgames.aether.common.entities.projectiles.EntityDaggerfrostSnowball;
import net.minecraft.entity.Entity;


+ 2
- 2
src/main/java/com/gildedgames/aether/common/entities/effects/processors/player/ModifyXPCollectionEffect.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.common.entities.effects.processors.player;

import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.common.entities.effects.EffectProcessorPlayer;
import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import com.gildedgames.aether.common.entities.effects.processors.player.ModifyXPCollectionEffect.Instance;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/processors/player/PauseHungerEffect.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.processors.player;

import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.common.entities.effects.EffectProcessorPlayer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/rules/DamagingMobRule.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.rules;

import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import net.minecraft.entity.Entity;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.event.entity.living.LivingHurtEvent;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/rules/DamagingUndeadRule.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.rules;

import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import net.minecraft.entity.Entity;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.event.entity.living.LivingHurtEvent;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/rules/HoldingItemRule.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.rules;

import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import com.mojang.realmsclient.gui.ChatFormatting;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/rules/InBiomeRule.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.rules;

import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import net.minecraft.entity.Entity;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.biome.BiomeGenBase;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/rules/InCombatRule.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.rules;

import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import net.minecraft.entity.Entity;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.event.entity.living.LivingHurtEvent;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/rules/InDimensionRule.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.rules;

import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import net.minecraft.entity.Entity;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.event.entity.living.LivingHurtEvent;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/rules/InDirectMoonlightRule.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.rules;

import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import net.minecraft.entity.Entity;
import net.minecraftforge.event.entity.living.LivingHurtEvent;



+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/rules/InDirectSunlightRule.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.rules;

import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import net.minecraft.entity.Entity;
import net.minecraftforge.event.entity.living.LivingHurtEvent;



+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/rules/OnGroundRule.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.rules;

import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import net.minecraft.entity.Entity;
import net.minecraftforge.event.entity.living.LivingHurtEvent;



+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/rules/OutOfCombatRule.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.rules;

import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import com.gildedgames.aether.common.entities.effects.EntityEffects;
import net.minecraft.entity.Entity;
import net.minecraftforge.event.entity.living.LivingHurtEvent;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/rules/UndergroundRule.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.rules;

import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import net.minecraft.entity.Entity;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.event.entity.living.LivingHurtEvent;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/effects/rules/WearingItemsRule.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.entities.effects.rules;

import com.gildedgames.aether.entities.effects.EntityEffectRule;
import com.gildedgames.aether.api.entities.effects.EntityEffectRule;
import net.minecraft.entity.Entity;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.event.entity.living.LivingHurtEvent;


+ 5
- 6
src/main/java/com/gildedgames/aether/common/items/ItemsAether.java View File

@@ -5,10 +5,9 @@ import java.util.List;
import com.gildedgames.aether.common.items.armor.ItemAetherGloves;
import com.gildedgames.aether.common.items.armor.ItemLeatherGloves;
import com.gildedgames.aether.common.items.effects.ItemEffects;
import com.gildedgames.aether.common.items.properties.ItemProperties;
import com.gildedgames.aether.items.properties.ItemEquipmentType;
import com.gildedgames.aether.items.properties.ItemRarity;
import com.gildedgames.aether.registry.equipment.IEquipmentRegistry;
import com.gildedgames.aether.api.items.properties.ItemEquipmentType;
import com.gildedgames.aether.api.items.properties.ItemRarity;
import com.gildedgames.aether.api.registry.equipment.IEquipmentRegistry;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -28,8 +27,8 @@ import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.AetherCreativeTabs;
import com.gildedgames.aether.common.AetherMaterials;
import com.gildedgames.aether.common.blocks.BlocksAether;
import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.common.entities.effects.EntityEffects;
import com.gildedgames.aether.common.entities.effects.processors.DoubleDropEffect;
import com.gildedgames.aether.common.entities.effects.processors.FreezeBlocksEffect;


+ 3
- 3
src/main/java/com/gildedgames/aether/common/items/effects/ItemEffects.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.common.items.effects;

import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.items.IItemEffectsCapability;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.items.IItemEffectsCapability;
import com.google.common.collect.Lists;
import net.minecraft.item.Item;
import net.minecraft.nbt.NBTBase;


+ 4
- 4
src/main/java/com/gildedgames/aether/common/items/effects/ItemEffectsProvider.java View File

@@ -1,9 +1,9 @@
package com.gildedgames.aether.common.items.effects;

import com.gildedgames.aether.capabilites.AetherCapabilities;
import com.gildedgames.aether.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.items.IItemEffectsCapability;
import com.gildedgames.aether.api.capabilites.AetherCapabilities;
import com.gildedgames.aether.api.entities.effects.EntityEffectInstance;
import com.gildedgames.aether.api.entities.effects.EntityEffectProcessor;
import com.gildedgames.aether.api.items.IItemEffectsCapability;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;


+ 6
- 15
src/main/java/com/gildedgames/aether/common/items/properties/EquipmentRegistry.java View File

@@ -1,9 +1,9 @@
package com.gildedgames.aether.common.items.properties;

import com.gildedgames.aether.items.properties.ItemEquipmentType;
import com.gildedgames.aether.items.properties.ItemRarity;
import com.gildedgames.aether.registry.equipment.IEquipmentProperties;
import com.gildedgames.aether.registry.equipment.IEquipmentRegistry;
import com.gildedgames.aether.api.items.properties.ItemEquipmentType;
import com.gildedgames.aether.api.items.properties.ItemRarity;
import com.gildedgames.aether.api.registry.equipment.IEquipmentProperties;
import com.gildedgames.aether.api.registry.equipment.IEquipmentRegistry;
import net.minecraft.item.Item;

import java.util.HashMap;
@@ -15,7 +15,7 @@ public class EquipmentRegistry implements IEquipmentRegistry
@Override
public void register(Item item, ItemRarity rarity, ItemEquipmentType type)
{
this.registeredEntries.put(item.getRegistryName(), new EquipmentProperties(item, rarity, type));
this.registeredEntries.put(item.getRegistryName(), new EquipmentProperties(rarity, type));
}

@Override
@@ -26,25 +26,16 @@ public class EquipmentRegistry implements IEquipmentRegistry

public static class EquipmentProperties implements IEquipmentProperties
{
private Item item;

private ItemRarity rarity;

private ItemEquipmentType equipmentType;

public EquipmentProperties(Item item, ItemRarity rarity, ItemEquipmentType equipmentType)
public EquipmentProperties(ItemRarity rarity, ItemEquipmentType equipmentType)
{
this.item = item;
this.rarity = rarity;
this.equipmentType = equipmentType;
}

@Override
public Item getItem()
{
return this.item;
}

@Override
public ItemRarity getRarity()
{


+ 5
- 19
src/main/java/com/gildedgames/aether/common/items/properties/ItemProperties.java View File

@@ -1,27 +1,19 @@
package com.gildedgames.aether.common.items.properties;

import com.gildedgames.aether.items.properties.ItemEquipmentType;
import com.gildedgames.aether.items.properties.ItemRarity;
import com.gildedgames.aether.items.IItemPropertiesCapability;
import com.gildedgames.aether.registry.equipment.IEquipmentProperties;
import com.google.common.collect.Lists;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import com.gildedgames.aether.api.items.properties.ItemEquipmentType;
import com.gildedgames.aether.api.items.properties.ItemRarity;
import com.gildedgames.aether.api.items.IItemPropertiesCapability;
import com.gildedgames.aether.api.registry.equipment.IEquipmentProperties;
import net.minecraft.nbt.NBTBase;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;

import java.util.List;

public class ItemProperties implements IItemPropertiesCapability
{
private final ItemStack stack;

private IEquipmentProperties properties;

public ItemProperties(ItemStack stack, IEquipmentProperties properties)
public ItemProperties(IEquipmentProperties properties)
{
this.stack = stack;
this.properties = properties;
}

@@ -43,12 +35,6 @@ public class ItemProperties implements IItemPropertiesCapability
return this.properties == null ? null : this.properties.getEquipmentType();
}

@Override
public ItemStack getStack()
{
return this.stack;
}

@Override
public boolean isEquippable()
{


+ 3
- 3
src/main/java/com/gildedgames/aether/common/items/properties/ItemPropertiesProvider.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.common.items.properties;

import com.gildedgames.aether.capabilites.AetherCapabilities;
import com.gildedgames.aether.api.capabilites.AetherCapabilities;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.items.IItemPropertiesCapability;
import com.gildedgames.aether.api.items.IItemPropertiesCapability;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
@@ -33,7 +33,7 @@ public class ItemPropertiesProvider implements ICapabilityProvider
{
if (this.properties == null)
{
this.properties = new ItemProperties(this.stack, AetherCore.INSTANCE.getEquipmentRegistry().getProperties(this.stack.getItem()));
this.properties = new ItemProperties(AetherCore.INSTANCE.getEquipmentRegistry().getProperties(this.stack.getItem()));
}

return (T) this.properties;


+ 3
- 3
src/main/java/com/gildedgames/aether/common/player/PlayerAether.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.player;

import com.gildedgames.aether.capabilites.AetherCapabilities;
import com.gildedgames.aether.api.capabilites.AetherCapabilities;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.containers.inventory.InventoryEquipment;
import com.gildedgames.aether.common.items.ItemsAether;
@@ -9,8 +9,8 @@ import com.gildedgames.aether.common.items.armor.ItemGravititeArmor;
import com.gildedgames.aether.common.items.armor.ItemNeptuneArmor;
import com.gildedgames.aether.common.items.tools.ItemValkyrieTool;
import com.gildedgames.aether.common.util.PlayerUtil;
import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.player.inventory.IInventoryEquipment;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.player.inventory.IInventoryEquipment;
import net.minecraft.block.material.Material;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/player/PlayerAetherEvents.java View File

@@ -1,7 +1,7 @@
package com.gildedgames.aether.common.player;

import com.gildedgames.aether.common.world.chunk.AetherPlaceFlagChunkHook;
import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import com.gildedgames.util.modules.chunk.ChunkModule;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingDropsEvent;


+ 2
- 2
src/main/java/com/gildedgames/aether/common/player/PlayerAetherProvider.java View File

@@ -1,7 +1,7 @@
package com.gildedgames.aether.common.player;

import com.gildedgames.aether.capabilites.AetherCapabilities;
import com.gildedgames.aether.player.IPlayerAetherCapability;
import com.gildedgames.aether.api.capabilites.AetherCapabilities;
import com.gildedgames.aether.api.player.IPlayerAetherCapability;
import net.minecraft.nbt.NBTBase;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;


+ 2
- 2
src/main/java/com/gildedgames/aether/common/recipes/AltarRegistry.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.recipes;

import com.gildedgames.aether.registry.altar.IAltarRecipe;
import com.gildedgames.aether.api.registry.altar.IAltarRecipe;
import net.minecraft.item.ItemStack;

import java.util.ArrayList;
@@ -18,7 +18,7 @@ public class AltarRegistry
{
for (IAltarRecipe recipe : this.getAltarRecipes())
{
if (recipe.matchesItem(stack))
if (recipe.matchesRecipe(stack))
{
return recipe;
}


+ 2
- 2
src/main/java/com/gildedgames/aether/common/recipes/RecipesAether.java View File

@@ -6,9 +6,9 @@ import com.gildedgames.aether.common.items.weapons.ItemDartType;
import com.gildedgames.aether.common.items.weapons.crossbow.ItemBoltType;
import com.gildedgames.aether.common.recipes.altar.AltarEnchantRecipe;
import com.gildedgames.aether.common.recipes.altar.AltarRepairRecipe;
import com.gildedgames.aether.registry.altar.IAltarRecipe;
import com.gildedgames.aether.api.registry.altar.IAltarRecipe;
import com.gildedgames.aether.common.recipes.dye.RecipeLeatherGlovesDyes;
import com.gildedgames.aether.registry.altar.IAltarRecipeRegistry;
import com.gildedgames.aether.api.registry.altar.IAltarRecipeRegistry;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;


+ 2
- 2
src/main/java/com/gildedgames/aether/common/recipes/altar/AltarEnchantRecipe.java View File

@@ -1,6 +1,6 @@
package com.gildedgames.aether.common.recipes.altar;

import com.gildedgames.aether.registry.altar.IAltarRecipe;
import com.gildedgames.aether.api.registry.altar.IAltarRecipe;
import net.minecraft.item.ItemStack;

public class AltarEnchantRecipe implements IAltarRecipe
@@ -20,7 +20,7 @@ public class AltarEnchantRecipe implements IAltarRecipe
}

@Override
public boolean matchesItem(ItemStack stack)
public boolean matchesRecipe(ItemStack stack)
{
return this.input.isItemEqual(stack);
}


+ 2
- 2
src/main/java/com/gildedgames/aether/common/recipes/altar/AltarRepairRecipe.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.recipes.altar;
import com.gildedgames.aether.common.AetherMaterials;
import com.gildedgames.aether.common.items.tools.ItemAetherTool;
import com.gildedgames.aether.common.items.weapons.swords.ItemAetherSword;
import com.gildedgames.aether.registry.altar.IAltarRecipe;
import com.gildedgames.aether.api.registry.altar.IAltarRecipe;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
@@ -12,7 +12,7 @@ import net.minecraft.item.ItemTool;
public class AltarRepairRecipe implements IAltarRecipe
{
@Override
public boolean matchesItem(ItemStack stack)
public boolean matchesRecipe(ItemStack stack)
{
return (stack.getItem() instanceof ItemSword || stack.getItem() instanceof ItemTool || stack.getItem() instanceof ItemArmor) && stack.isItemDamaged();
}


+ 1
- 1
src/main/java/com/gildedgames/aether/common/tile_entities/TileEntityAltar.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.tile_entities;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.blocks.construction.BlockAltar;
import com.gildedgames.aether.common.items.ItemsAether;
import com.gildedgames.aether.registry.altar.IAltarRecipe;
import com.gildedgames.aether.api.registry.altar.IAltarRecipe;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;


src/main/resources/LICENSE → src/main/resources/assets/LICENSE View File


Loading…
Cancel
Save