Browse Source

refactor: Refactor `com.gildedgames.orbis_api` to `com.gildedgames.orbis.lib`

1.13.x-indev
JellySquid 9 months ago
parent
commit
ff26cc039a
100 changed files with 1089 additions and 1098 deletions
  1. 1
    1
      .gitmodules
  2. 1
    0
      lib/orbis-lib
  3. 1
    1
      src/api/java/com/gildedgames/aether/api/chunk/IPlacementFlagCapability.java
  4. 1
    1
      src/api/java/com/gildedgames/aether/api/effects_system/IAetherStatusEffects.java
  5. 1
    1
      src/api/java/com/gildedgames/aether/api/entity/EntityNPC.java
  6. 1
    1
      src/api/java/com/gildedgames/aether/api/entity/genes/IGeneStorage.java
  7. 1
    1
      src/api/java/com/gildedgames/aether/api/player/inventory/IInventoryEquipment.java
  8. 1
    1
      src/api/java/com/gildedgames/aether/api/shop/IGuiCurrencyValue.java
  9. 1
    1
      src/api/java/com/gildedgames/aether/api/shop/IShopBuy.java
  10. 2
    2
      src/api/java/com/gildedgames/aether/api/shop/IShopCurrency.java
  11. 1
    1
      src/api/java/com/gildedgames/aether/api/shop/IShopInstance.java
  12. 1
    1
      src/api/java/com/gildedgames/aether/api/shop/IShopInstanceGroup.java
  13. 1
    1
      src/api/java/com/gildedgames/aether/api/util/TemplateUtil.java
  14. 1
    1
      src/api/java/com/gildedgames/aether/api/world/IAetherChunkColumnInfo.java
  15. 1
    1
      src/api/java/com/gildedgames/aether/api/world/ISpawnAreaManager.java
  16. 2
    2
      src/api/java/com/gildedgames/aether/api/world/TemplateInstance.java
  17. 1
    1
      src/api/java/com/gildedgames/aether/api/world/generation/BlockRotationProcessorExtended.java
  18. 8
    8
      src/api/java/com/gildedgames/aether/api/world/generation/BlueprintWorldGen.java
  19. 1
    1
      src/api/java/com/gildedgames/aether/api/world/generation/ITemplateProcessorExtended.java
  20. 1
    1
      src/api/java/com/gildedgames/aether/api/world/generation/PlacementConditionTemplate.java
  21. 1
    1
      src/api/java/com/gildedgames/aether/api/world/generation/TemplateDefinition.java
  22. 2
    2
      src/api/java/com/gildedgames/aether/api/world/generation/TemplateLoc.java
  23. 1
    1
      src/api/java/com/gildedgames/aether/api/world/generation/WorldDecorationGenerator.java
  24. 1
    1
      src/api/java/com/gildedgames/aether/api/world/generation/WorldDecorationUtil.java
  25. 4
    4
      src/api/java/com/gildedgames/aether/api/world/islands/IIslandData.java
  26. 2
    2
      src/api/java/com/gildedgames/aether/api/world/islands/IIslandGenerator.java
  27. 3
    3
      src/main/java/com/gildedgames/aether/client/ClientEventHandler.java
  28. 1
    1
      src/main/java/com/gildedgames/aether/client/gui/container/simple_crafting/GuiMasonryBench.java
  29. 7
    7
      src/main/java/com/gildedgames/aether/client/gui/dialog/GuiCoins.java
  30. 11
    11
      src/main/java/com/gildedgames/aether/client/gui/dialog/GuiCoinsContainer.java
  31. 4
    4
      src/main/java/com/gildedgames/aether/client/gui/dialog/GuiDialogViewer.java
  32. 106
    106
      src/main/java/com/gildedgames/aether/client/gui/dialog/GuiExpandableCoinTab.java
  33. 2
    2
      src/main/java/com/gildedgames/aether/client/gui/dialog/GuiNextArrow.java
  34. 7
    7
      src/main/java/com/gildedgames/aether/client/gui/dialog/GuiPumpkinCurrency.java
  35. 14
    14
      src/main/java/com/gildedgames/aether/client/gui/dialog/GuiShop.java
  36. 6
    6
      src/main/java/com/gildedgames/aether/client/gui/dialog/GuiShopBuy.java
  37. 706
    707
      src/main/java/com/gildedgames/aether/client/gui/dialog/GuiTrade.java
  38. 10
    10
      src/main/java/com/gildedgames/aether/client/gui/misc/GuiAetherLoading.java
  39. 11
    11
      src/main/java/com/gildedgames/aether/client/gui/misc/GuiAetherTeleporterNotice.java
  40. 11
    11
      src/main/java/com/gildedgames/aether/client/gui/misc/GuiIntro.java
  41. 6
    6
      src/main/java/com/gildedgames/aether/client/gui/misc/GuiPatronRewardEntry.java
  42. 14
    14
      src/main/java/com/gildedgames/aether/client/gui/misc/GuiPatronRewards.java
  43. 3
    3
      src/main/java/com/gildedgames/aether/client/gui/util/GuiItemStack.java
  44. 0
    4
      src/main/java/com/gildedgames/aether/client/models/entities/living/ModelZephyr.java
  45. 1
    1
      src/main/java/com/gildedgames/aether/client/renderer/PatronRewardArmorRenderer.java
  46. 0
    1
      src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderAerwhale.java
  47. 1
    4
      src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderZephyr.java
  48. 3
    4
      src/main/java/com/gildedgames/aether/common/CommonEvents.java
  49. 6
    6
      src/main/java/com/gildedgames/aether/common/CommonProxy.java
  50. 1
    1
      src/main/java/com/gildedgames/aether/common/blocks/natural/plants/saplings/BlockAetherGreatrootSapling.java
  51. 4
    4
      src/main/java/com/gildedgames/aether/common/blocks/natural/plants/saplings/BlockAetherSapling.java
  52. 1
    1
      src/main/java/com/gildedgames/aether/common/blocks/natural/plants/saplings/BlockAetherSkyrootSapling.java
  53. 1
    1
      src/main/java/com/gildedgames/aether/common/blocks/natural/plants/saplings/BlockAetherUniqueSapling.java
  54. 1
    1
      src/main/java/com/gildedgames/aether/common/blocks/natural/plants/saplings/BlockAetherWisprootSapling.java
  55. 2
    2
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/PlayerAether.java
  56. 2
    2
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/PlayerAetherHooks.java
  57. 1
    1
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/PlayerAetherModule.java
  58. 2
    2
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerCampfiresModule.java
  59. 1
    1
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerPreventDropsModule.java
  60. 1
    1
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerProgressModule.java
  61. 5
    5
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerSectorModule.java
  62. 3
    3
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerTeleportingModule.java
  63. 1
    1
      src/main/java/com/gildedgames/aether/common/entities/genes/moa/MoaGenePool.java
  64. 1
    1
      src/main/java/com/gildedgames/aether/common/entities/living/mounts/EntityMoa.java
  65. 1
    1
      src/main/java/com/gildedgames/aether/common/entities/living/npc/EntityEdison.java
  66. 1
    1
      src/main/java/com/gildedgames/aether/common/entities/living/npc/EntityJosediya.java
  67. 1
    1
      src/main/java/com/gildedgames/aether/common/entities/living/npc/EntityMysteriousFigure.java
  68. 1
    1
      src/main/java/com/gildedgames/aether/common/entities/living/npc/EntityNecromancer.java
  69. 1
    1
      src/main/java/com/gildedgames/aether/common/entities/living/npc/EntityTivalier.java
  70. 2
    2
      src/main/java/com/gildedgames/aether/common/entities/tiles/TileEntityOutpostCampfire.java
  71. 2
    2
      src/main/java/com/gildedgames/aether/common/entities/tiles/TileEntitySchematicBlock.java
  72. 6
    6
      src/main/java/com/gildedgames/aether/common/entities/tiles/TileEntityTeleporter.java
  73. 2
    2
      src/main/java/com/gildedgames/aether/common/entities/tiles/TileEntityWildcard.java
  74. 1
    1
      src/main/java/com/gildedgames/aether/common/entities/tiles/multiblock/TileEntityMultiblockDummy.java
  75. 1
    1
      src/main/java/com/gildedgames/aether/common/entities/util/MoaNest.java
  76. 1
    1
      src/main/java/com/gildedgames/aether/common/network/AetherGuiHandler.java
  77. 2
    2
      src/main/java/com/gildedgames/aether/common/network/packets/PacketCampfires.java
  78. 4
    4
      src/main/java/com/gildedgames/aether/common/network/packets/PacketCancelIntro.java
  79. 1
    1
      src/main/java/com/gildedgames/aether/common/network/packets/dialog/PacketConditionsMetData.java
  80. 1
    1
      src/main/java/com/gildedgames/aether/common/network/packets/dialog/PacketOpenDialog.java
  81. 1
    1
      src/main/java/com/gildedgames/aether/common/patron/PatronChoices.java
  82. 5
    5
      src/main/java/com/gildedgames/aether/common/registry/ContentRegistry.java
  83. 5
    5
      src/main/java/com/gildedgames/aether/common/registry/content/BlueprintsAether.java
  84. 11
    11
      src/main/java/com/gildedgames/aether/common/registry/content/GenerationAether.java
  85. 2
    2
      src/main/java/com/gildedgames/aether/common/registry/content/InstancesAether.java
  86. 1
    1
      src/main/java/com/gildedgames/aether/common/shop/ShopBuy.java
  87. 1
    1
      src/main/java/com/gildedgames/aether/common/shop/ShopCurrencyGilt.java
  88. 1
    1
      src/main/java/com/gildedgames/aether/common/shop/ShopCurrencyPlumproot.java
  89. 1
    1
      src/main/java/com/gildedgames/aether/common/shop/ShopInstance.java
  90. 1
    1
      src/main/java/com/gildedgames/aether/common/shop/ShopInstanceGroup.java
  91. 1
    1
      src/main/java/com/gildedgames/aether/common/shop/ShopInventory.java
  92. 1
    1
      src/main/java/com/gildedgames/aether/common/util/helpers/AetherHelper.java
  93. 2
    2
      src/main/java/com/gildedgames/aether/common/util/helpers/IslandHelper.java
  94. 9
    9
      src/main/java/com/gildedgames/aether/common/world/aether/ChunkGeneratorAether.java
  95. 3
    3
      src/main/java/com/gildedgames/aether/common/world/aether/WorldPreparationAether.java
  96. 1
    1
      src/main/java/com/gildedgames/aether/common/world/aether/biomes/BiomeAetherBase.java
  97. 10
    10
      src/main/java/com/gildedgames/aether/common/world/aether/biomes/BiomeAetherDecorator.java
  98. 4
    4
      src/main/java/com/gildedgames/aether/common/world/aether/biomes/BiomeProviderAether.java
  99. 1
    1
      src/main/java/com/gildedgames/aether/common/world/aether/biomes/BiomeVoid.java
  100. 0
    0
      src/main/java/com/gildedgames/aether/common/world/aether/biomes/arctic_peaks/BiomeArcticPeaks.java

+ 1
- 1
.gitmodules View File

@@ -1,3 +1,3 @@
[submodule "OrbisAPI"]
path = lib/orbis-lib
url = https://gitea.gildedgames.com/GildedGames/Orbis-Library.git
url = https://gitea.gildedgames.com/GildedGames/OrbisLib.git

+ 1
- 0
lib/orbis-lib

@@ -0,0 +1 @@
Subproject commit 34288c235a512d84306d6de239ab9b0d17209d50

+ 1
- 1
src/api/java/com/gildedgames/aether/api/chunk/IPlacementFlagCapability.java View File

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

import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;
import net.minecraft.util.math.BlockPos;

/**

+ 1
- 1
src/api/java/com/gildedgames/aether/api/effects_system/IAetherStatusEffects.java View File

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

import com.gildedgames.aether.api.AetherCapabilities;
import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraftforge.fml.relauncher.Side;

+ 1
- 1
src/api/java/com/gildedgames/aether/api/entity/EntityNPC.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.api.entity;
import com.gildedgames.aether.api.shop.IShopInstance;
import com.gildedgames.aether.api.shop.IShopInstanceGroup;
import com.gildedgames.aether.api.world.IWorldObjectHoverable;
import com.gildedgames.orbis_api.util.io.NBTFunnel;
import com.gildedgames.orbis.lib.util.io.NBTFunnel;
import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;

+ 1
- 1
src/api/java/com/gildedgames/aether/api/entity/genes/IGeneStorage.java View File

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

import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;

public interface IGeneStorage extends NBT
{

+ 1
- 1
src/api/java/com/gildedgames/aether/api/player/inventory/IInventoryEquipment.java View File

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

import com.gildedgames.aether.api.items.equipment.ItemEquipmentSlot;
import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;
import net.minecraft.inventory.IInventory;

public interface IInventoryEquipment extends IInventory, NBT

+ 1
- 1
src/api/java/com/gildedgames/aether/api/shop/IGuiCurrencyValue.java View File

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

import com.gildedgames.orbis_api.client.gui.util.gui_library.IGuiElement;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.IGuiElement;

public interface IGuiCurrencyValue extends IGuiElement
{

+ 1
- 1
src/api/java/com/gildedgames/aether/api/shop/IShopBuy.java View File

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

import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;
import net.minecraft.item.ItemStack;

import java.util.List;

+ 2
- 2
src/api/java/com/gildedgames/aether/api/shop/IShopCurrency.java View File

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

import com.gildedgames.aether.api.player.IPlayerAether;
import com.gildedgames.orbis_api.client.rect.Rect;
import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.client.rect.Rect;
import com.gildedgames.orbis.lib.util.mc.NBT;

public interface IShopCurrency extends NBT
{

+ 1
- 1
src/api/java/com/gildedgames/aether/api/shop/IShopInstance.java View File

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

import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.util.ResourceLocation;

+ 1
- 1
src/api/java/com/gildedgames/aether/api/shop/IShopInstanceGroup.java View File

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

import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;

import java.util.Collection;


+ 1
- 1
src/api/java/com/gildedgames/aether/api/util/TemplateUtil.java View File

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

import com.gildedgames.aether.api.world.generation.TemplateDefinition;
import com.gildedgames.aether.api.world.generation.TemplateLoc;
import com.gildedgames.orbis_api.processing.IBlockAccessExtended;
import com.gildedgames.orbis.lib.processing.IBlockAccessExtended;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;

+ 1
- 1
src/api/java/com/gildedgames/aether/api/world/IAetherChunkColumnInfo.java View File

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

import com.gildedgames.aether.api.world.islands.IIslandChunkColumnInfo;
import com.gildedgames.orbis_api.preparation.IChunkColumnInfo;
import com.gildedgames.orbis.lib.preparation.IChunkColumnInfo;

public interface IAetherChunkColumnInfo extends IChunkColumnInfo
{

+ 1
- 1
src/api/java/com/gildedgames/aether/api/world/ISpawnAreaManager.java View File

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

import com.gildedgames.orbis_api.world.data.IWorldData;
import com.gildedgames.orbis.lib.world.data.IWorldData;
import net.minecraft.world.World;
import net.minecraftforge.event.entity.living.LivingDeathEvent;


+ 2
- 2
src/api/java/com/gildedgames/aether/api/world/TemplateInstance.java View File

@@ -4,8 +4,8 @@ import com.gildedgames.aether.api.AetherAPI;
import com.gildedgames.aether.api.util.TemplateUtil;
import com.gildedgames.aether.api.world.generation.TemplateDefinition;
import com.gildedgames.aether.api.world.generation.TemplateLoc;
import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis_api.util.mc.NBTHelper;
import com.gildedgames.orbis.lib.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBTHelper;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.ChunkPos;
import org.apache.commons.lang3.builder.EqualsBuilder;

+ 1
- 1
src/api/java/com/gildedgames/aether/api/world/generation/BlockRotationProcessorExtended.java View File

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

import com.gildedgames.orbis_api.processing.IBlockAccessExtended;
import com.gildedgames.orbis.lib.processing.IBlockAccessExtended;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.gen.structure.template.PlacementSettings;

+ 8
- 8
src/api/java/com/gildedgames/aether/api/world/generation/BlueprintWorldGen.java View File

@@ -1,13 +1,13 @@
package com.gildedgames.aether.api.world.generation;

import com.gildedgames.orbis_api.core.BlueprintDefinition;
import com.gildedgames.orbis_api.core.CreationData;
import com.gildedgames.orbis_api.core.ICreationData;
import com.gildedgames.orbis_api.core.baking.BakedBlueprint;
import com.gildedgames.orbis_api.core.util.BlueprintPlacer;
import com.gildedgames.orbis_api.processing.BlockAccessWorldSlice;
import com.gildedgames.orbis_api.processing.DataPrimer;
import com.gildedgames.orbis_api.world.WorldSlice;
import com.gildedgames.orbis.lib.core.BlueprintDefinition;
import com.gildedgames.orbis.lib.core.CreationData;
import com.gildedgames.orbis.lib.core.ICreationData;
import com.gildedgames.orbis.lib.core.baking.BakedBlueprint;
import com.gildedgames.orbis.lib.core.util.BlueprintPlacer;
import com.gildedgames.orbis.lib.processing.BlockAccessWorldSlice;
import com.gildedgames.orbis.lib.processing.DataPrimer;
import com.gildedgames.orbis.lib.world.WorldSlice;
import net.minecraft.util.Rotation;
import net.minecraft.util.math.BlockPos;


+ 1
- 1
src/api/java/com/gildedgames/aether/api/world/generation/ITemplateProcessorExtended.java View File

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

import com.gildedgames.orbis_api.processing.IBlockAccessExtended;
import com.gildedgames.orbis.lib.processing.IBlockAccessExtended;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.gen.structure.template.ITemplateProcessor;
import net.minecraft.world.gen.structure.template.Template;

+ 1
- 1
src/api/java/com/gildedgames/aether/api/world/generation/PlacementConditionTemplate.java View File

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

import com.gildedgames.orbis_api.processing.IBlockAccessExtended;
import com.gildedgames.orbis.lib.processing.IBlockAccessExtended;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.gen.structure.template.Template;


+ 1
- 1
src/api/java/com/gildedgames/aether/api/world/generation/TemplateDefinition.java View File

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

import com.gildedgames.orbis_api.processing.CenterOffsetProcessor;
import com.gildedgames.orbis.lib.processing.CenterOffsetProcessor;
import com.google.common.collect.Lists;
import net.minecraft.world.gen.structure.template.Template;


+ 2
- 2
src/api/java/com/gildedgames/aether/api/world/generation/TemplateLoc.java View File

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

import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis_api.util.mc.NBTHelper;
import com.gildedgames.orbis.lib.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBTHelper;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Mirror;
import net.minecraft.util.math.BlockPos;

+ 1
- 1
src/api/java/com/gildedgames/aether/api/world/generation/WorldDecorationGenerator.java View File

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

import com.gildedgames.orbis_api.world.WorldSlice;
import com.gildedgames.orbis.lib.world.WorldSlice;
import net.minecraft.util.math.BlockPos;

import java.util.Random;

+ 1
- 1
src/api/java/com/gildedgames/aether/api/world/generation/WorldDecorationUtil.java View File

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

import com.gildedgames.aether.api.util.OpenSimplexNoise;
import com.gildedgames.orbis_api.world.WorldSlice;
import com.gildedgames.orbis.lib.world.WorldSlice;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.World;

+ 4
- 4
src/api/java/com/gildedgames/aether/api/world/islands/IIslandData.java View File

@@ -2,10 +2,10 @@ package com.gildedgames.aether.api.world.islands;

import com.gildedgames.aether.api.world.generation.WorldDecoration;
import com.gildedgames.aether.api.world.generation.caves.ICaveSystemGenerator;
import com.gildedgames.orbis_api.core.PlacedBlueprint;
import com.gildedgames.orbis_api.core.baking.BakedBlueprint;
import com.gildedgames.orbis_api.preparation.IPrepSectorData;
import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.core.PlacedBlueprint;
import com.gildedgames.orbis.lib.core.baking.BakedBlueprint;
import com.gildedgames.orbis.lib.preparation.IPrepSectorData;
import com.gildedgames.orbis.lib.util.mc.NBT;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.biome.Biome;


+ 2
- 2
src/api/java/com/gildedgames/aether/api/world/islands/IIslandGenerator.java View File

@@ -2,8 +2,8 @@ package com.gildedgames.aether.api.world.islands;

import com.gildedgames.aether.api.util.OpenSimplexNoise;
import com.gildedgames.aether.api.world.IAetherChunkColumnInfo;
import com.gildedgames.orbis_api.preparation.IChunkMaskTransformer;
import com.gildedgames.orbis_api.preparation.impl.ChunkMask;
import com.gildedgames.orbis.lib.preparation.IChunkMaskTransformer;
import com.gildedgames.orbis.lib.preparation.impl.ChunkMask;

import javax.annotation.Nonnull;


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

@@ -30,9 +30,9 @@ import com.gildedgames.aether.common.network.packets.PacketSpecialMovement;
import com.gildedgames.aether.common.registry.content.DimensionsAether;
import com.gildedgames.aether.common.registry.content.SoundsAether;
import com.gildedgames.aether.common.shop.ShopCurrencyGilt;
import com.gildedgames.orbis_api.client.PartialTicks;
import com.gildedgames.orbis_api.client.gui.util.GuiFrameUtils;
import com.gildedgames.orbis_api.util.InputHelper;
import com.gildedgames.orbis.lib.client.PartialTicks;
import com.gildedgames.orbis.lib.client.gui.util.GuiFrameUtils;
import com.gildedgames.orbis.lib.util.InputHelper;
import net.minecraft.client.LoadingScreenRenderer;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP;

+ 1
- 1
src/main/java/com/gildedgames/aether/client/gui/container/simple_crafting/GuiMasonryBench.java View File

@@ -11,7 +11,7 @@ import com.gildedgames.aether.common.network.NetworkingAether;
import com.gildedgames.aether.common.network.packets.PacketMasonryRecipeChanged;
import com.gildedgames.aether.common.recipes.simple.OreDictionaryRequirement;
import com.gildedgames.aether.common.util.helpers.RecipeUtil;
import com.gildedgames.orbis_api.util.InputHelper;
import com.gildedgames.orbis.lib.util.InputHelper;
import com.google.common.collect.Lists;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;

+ 7
- 7
src/main/java/com/gildedgames/aether/client/gui/dialog/GuiCoins.java View File

@@ -2,13 +2,13 @@ package com.gildedgames.aether.client.gui.dialog;

import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.capabilities.entity.player.modules.PlayerCurrencyModule;
import com.gildedgames.orbis_api.client.gui.data.Text;
import com.gildedgames.orbis_api.client.gui.util.GuiText;
import com.gildedgames.orbis_api.client.gui.util.GuiTexture;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis_api.client.rect.Pos2D;
import com.gildedgames.orbis_api.client.rect.Rect;
import com.gildedgames.orbis.lib.client.gui.data.Text;
import com.gildedgames.orbis.lib.client.gui.util.GuiText;
import com.gildedgames.orbis.lib.client.gui.util.GuiTexture;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.rect.Pos2D;
import com.gildedgames.orbis.lib.client.rect.Rect;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextFormatting;

+ 11
- 11
src/main/java/com/gildedgames/aether/client/gui/dialog/GuiCoinsContainer.java View File

@@ -2,17 +2,17 @@ package com.gildedgames.aether.client.gui.dialog;

import com.gildedgames.aether.api.shop.IGuiCurrencyValue;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.orbis_api.client.gui.util.GuiLine;
import com.gildedgames.orbis_api.client.gui.util.GuiTextLabel;
import com.gildedgames.orbis_api.client.gui.util.GuiTexture;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.gui.util.gui_library.IGuiElement;
import com.gildedgames.orbis_api.client.gui.util.gui_library.IGuiEvent;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis_api.client.rect.Pos2D;
import com.gildedgames.orbis_api.client.rect.Rect;
import com.gildedgames.orbis_api.util.InputHelper;
import com.gildedgames.orbis_api.util.MathUtil;
import com.gildedgames.orbis.lib.client.gui.util.GuiLine;
import com.gildedgames.orbis.lib.client.gui.util.GuiTextLabel;
import com.gildedgames.orbis.lib.client.gui.util.GuiTexture;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.IGuiElement;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.IGuiEvent;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.rect.Pos2D;
import com.gildedgames.orbis.lib.client.rect.Rect;
import com.gildedgames.orbis.lib.util.InputHelper;
import com.gildedgames.orbis.lib.util.MathUtil;
import net.minecraft.util.ResourceLocation;

public class GuiCoinsContainer extends GuiElement implements IGuiCurrencyValue

+ 4
- 4
src/main/java/com/gildedgames/aether/client/gui/dialog/GuiDialogViewer.java View File

@@ -4,10 +4,10 @@ import com.gildedgames.aether.api.AetherAPI;
import com.gildedgames.aether.api.dialog.*;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.containers.ContainerDialogController;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiViewer;
import com.gildedgames.orbis_api.client.gui.util.gui_library.IGuiContext;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiViewer;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.IGuiContext;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import com.google.common.collect.Lists;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;

+ 106
- 106
src/main/java/com/gildedgames/aether/client/gui/dialog/GuiExpandableCoinTab.java View File

@@ -1,106 +1,106 @@
package com.gildedgames.aether.client.gui.dialog;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.orbis_api.client.gui.util.GuiTexture;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis_api.client.rect.Pos2D;
import com.gildedgames.orbis_api.client.rect.Rect;
import com.gildedgames.orbis_api.util.InputHelper;
import net.minecraft.util.ResourceLocation;
public class GuiExpandableCoinTab extends GuiElement
{
private static final ResourceLocation GILT_BAG = AetherCore.getResource("textures/gui/shop/gilt_bag.png");
private static final ResourceLocation GILT_GROW = AetherCore.getResource("textures/gui/trade/gilt_grow.png");
private static final ResourceLocation GILT_GROW_LEFT = AetherCore.getResource("textures/gui/trade/gilt_grow_left.png");
private static final ResourceLocation GILT_GROW_RIGHT = AetherCore.getResource("textures/gui/trade/gilt_grow_right.png");
private GuiCoins coinsCount;
private GuiTexture giltBag, shape, extent;
private boolean left, inactive;
private float x, y, width;
public GuiExpandableCoinTab(Rect rect, boolean shouldDisplayAlways, boolean left, boolean inactive, float x, float y)
{
super(rect, shouldDisplayAlways);
this.left = left;
this.inactive = inactive;
this.x = x;
this.y = y;
}
@Override
public void build()
{
this.giltBag = new GuiTexture(Dim2D.build().width(16).height(16).flush(),
GILT_BAG);
this.coinsCount = new GuiCoins(Dim2D.build().flush(), true);
this.extent = new GuiTexture(Dim2D.build().width(1).height(23).flush(),
GILT_GROW);
if (this.left)
{
this.shape = new GuiTexture(Dim2D.build().width(3).height(23).flush(),
GILT_GROW_LEFT);
}
else
{
this.shape = new GuiTexture(Dim2D.build().width(3).height(23).flush(),
GILT_GROW_RIGHT);
}
this.update();
this.context().addChildren(this.shape, this.extent, this.coinsCount, this.giltBag);
}
private void update()
{
Pos2D center = InputHelper.getCenter().clone().flush();
float off = this.coinsCount.dim().width();
this.dim().mod().pos(center).addX(this.x - (this.left ? off : 0)).y(this.y).flush();
this.giltBag.dim().mod().pos((this.left ? -18 : off + 2), 4).flush();
this.coinsCount.dim().mod().pos(0, 4).flush();
this.extent.dim().mod().width(off + 21).pos((this.left ? -19 : -2), 0).flush();
if (this.left)
{
this.shape.dim().mod().pos(-22, 0).flush();
}
else
{
this.shape.dim().mod().pos(off + 19, 0).flush();
}
this.width = off + 27;
}
public boolean intersected(int mouseX, int mouseY)
{
Pos2D center = InputHelper.getCenter().clone().flush();
float off = (this.left ? this.width - 12 : 0);
return mouseX > center.x() - 7 + this.x - off && mouseX < center.x() - 7 + this.x - off + this.width && mouseY > this.y && mouseY < this.y + 21;
}
public void setCurrencyValue(double value)
{
this.coinsCount.setCurrencyValue(value);
this.update();
}
}
package com.gildedgames.aether.client.gui.dialog;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.orbis.lib.client.gui.util.GuiTexture;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.rect.Pos2D;
import com.gildedgames.orbis.lib.client.rect.Rect;
import com.gildedgames.orbis.lib.util.InputHelper;
import net.minecraft.util.ResourceLocation;
public class GuiExpandableCoinTab extends GuiElement
{
private static final ResourceLocation GILT_BAG = AetherCore.getResource("textures/gui/shop/gilt_bag.png");
private static final ResourceLocation GILT_GROW = AetherCore.getResource("textures/gui/trade/gilt_grow.png");
private static final ResourceLocation GILT_GROW_LEFT = AetherCore.getResource("textures/gui/trade/gilt_grow_left.png");
private static final ResourceLocation GILT_GROW_RIGHT = AetherCore.getResource("textures/gui/trade/gilt_grow_right.png");
private GuiCoins coinsCount;
private GuiTexture giltBag, shape, extent;
private boolean left, inactive;
private float x, y, width;
public GuiExpandableCoinTab(Rect rect, boolean shouldDisplayAlways, boolean left, boolean inactive, float x, float y)
{
super(rect, shouldDisplayAlways);
this.left = left;
this.inactive = inactive;
this.x = x;
this.y = y;
}
@Override
public void build()
{
this.giltBag = new GuiTexture(Dim2D.build().width(16).height(16).flush(),
GILT_BAG);
this.coinsCount = new GuiCoins(Dim2D.build().flush(), true);
this.extent = new GuiTexture(Dim2D.build().width(1).height(23).flush(),
GILT_GROW);
if (this.left)
{
this.shape = new GuiTexture(Dim2D.build().width(3).height(23).flush(),
GILT_GROW_LEFT);
}
else
{
this.shape = new GuiTexture(Dim2D.build().width(3).height(23).flush(),
GILT_GROW_RIGHT);
}
this.update();
this.context().addChildren(this.shape, this.extent, this.coinsCount, this.giltBag);
}
private void update()
{
Pos2D center = InputHelper.getCenter().clone().flush();
float off = this.coinsCount.dim().width();
this.dim().mod().pos(center).addX(this.x - (this.left ? off : 0)).y(this.y).flush();
this.giltBag.dim().mod().pos((this.left ? -18 : off + 2), 4).flush();
this.coinsCount.dim().mod().pos(0, 4).flush();
this.extent.dim().mod().width(off + 21).pos((this.left ? -19 : -2), 0).flush();
if (this.left)
{
this.shape.dim().mod().pos(-22, 0).flush();
}
else
{
this.shape.dim().mod().pos(off + 19, 0).flush();
}
this.width = off + 27;
}
public boolean intersected(int mouseX, int mouseY)
{
Pos2D center = InputHelper.getCenter().clone().flush();
float off = (this.left ? this.width - 12 : 0);
return mouseX > center.x() - 7 + this.x - off && mouseX < center.x() - 7 + this.x - off + this.width && mouseY > this.y && mouseY < this.y + 21;
}
public void setCurrencyValue(double value)
{
this.coinsCount.setCurrencyValue(value);
this.update();
}
}

+ 2
- 2
src/main/java/com/gildedgames/aether/client/gui/dialog/GuiNextArrow.java View File

@@ -1,8 +1,8 @@
package com.gildedgames.aether.client.gui.dialog;

import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.renderer.GlStateManager;

+ 7
- 7
src/main/java/com/gildedgames/aether/client/gui/dialog/GuiPumpkinCurrency.java View File

@@ -2,13 +2,13 @@ package com.gildedgames.aether.client.gui.dialog;

import com.gildedgames.aether.api.shop.IGuiCurrencyValue;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.orbis_api.client.gui.data.Text;
import com.gildedgames.orbis_api.client.gui.util.GuiText;
import com.gildedgames.orbis_api.client.gui.util.GuiTexture;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis_api.client.rect.Pos2D;
import com.gildedgames.orbis_api.client.rect.Rect;
import com.gildedgames.orbis.lib.client.gui.data.Text;
import com.gildedgames.orbis.lib.client.gui.util.GuiText;
import com.gildedgames.orbis.lib.client.gui.util.GuiTexture;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.rect.Pos2D;
import com.gildedgames.orbis.lib.client.rect.Rect;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextFormatting;

+ 14
- 14
src/main/java/com/gildedgames/aether/client/gui/dialog/GuiShop.java View File

@@ -17,16 +17,16 @@ import com.gildedgames.aether.common.network.packets.PacketShopBuy;
import com.gildedgames.aether.common.network.packets.PacketShopSell;
import com.gildedgames.aether.common.util.helpers.ItemHelper;
import com.gildedgames.aether.common.util.helpers.MathUtil;
import com.gildedgames.orbis_api.client.gui.data.Text;
import com.gildedgames.orbis_api.client.gui.util.GuiAbstractButton;
import com.gildedgames.orbis_api.client.gui.util.GuiTexture;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiViewer;
import com.gildedgames.orbis_api.client.gui.util.gui_library.IGuiContext;
import com.gildedgames.orbis_api.client.gui.util.vanilla.GuiButtonVanilla;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis_api.client.rect.Pos2D;
import com.gildedgames.orbis_api.util.InputHelper;
import com.gildedgames.orbis.lib.client.gui.data.Text;
import com.gildedgames.orbis.lib.client.gui.util.GuiAbstractButton;
import com.gildedgames.orbis.lib.client.gui.util.GuiTexture;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiViewer;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.IGuiContext;
import com.gildedgames.orbis.lib.client.gui.util.vanilla.GuiButtonVanilla;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.rect.Pos2D;
import com.gildedgames.orbis.lib.util.InputHelper;
import com.google.common.collect.Lists;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
@@ -100,7 +100,7 @@ public class GuiShop extends GuiViewer implements ICurrencyListener, IExtendedGu

private GuiItemStack stackGui;

private com.gildedgames.orbis_api.client.gui.util.GuiTextBox buyTitle;
private com.gildedgames.orbis.lib.client.gui.util.GuiTextBox buyTitle;

private GuiTextBox npcDialogue, npcGreeting;

@@ -124,7 +124,7 @@ public class GuiShop extends GuiViewer implements ICurrencyListener, IExtendedGu

private GuiTexture holidayNotice, holidayIcon;

private com.gildedgames.orbis_api.client.gui.util.GuiTextBox holidayNoticeText;
private com.gildedgames.orbis.lib.client.gui.util.GuiTextBox holidayNoticeText;

public GuiShop(GuiViewer prevViewer, EntityPlayer player, IDialogSlide slide, IDialogSlideRenderer renderer, IShopInstance shopInstance, int shopIndex)
{
@@ -179,7 +179,7 @@ public class GuiShop extends GuiViewer implements ICurrencyListener, IExtendedGu

this.holidayIcon = new GuiTexture(Dim2D.build().width(14).height(16).x(8).y(18).flush(), HOLIDAY_ICON);

this.holidayNoticeText = new com.gildedgames.orbis_api.client.gui.util.GuiTextBox(Dim2D.build().width(80).height(40).x(27).y(17).flush(), false,
this.holidayNoticeText = new com.gildedgames.orbis.lib.client.gui.util.GuiTextBox(Dim2D.build().width(80).height(40).x(27).y(17).flush(), false,
new Text(new TextComponentTranslation("edison.shop.holiday_notice"), 1.0F));

this.sellCoins = this.shopInstance.getCurrencyType()
@@ -236,7 +236,7 @@ public class GuiShop extends GuiViewer implements ICurrencyListener, IExtendedGu

this.npcGreeting.setText(new TextComponentTranslation(greeting));

this.buyTitle = new com.gildedgames.orbis_api.client.gui.util.GuiTextBox(
this.buyTitle = new com.gildedgames.orbis.lib.client.gui.util.GuiTextBox(
Dim2D.build().centerX(true).pos(center).width(60).height(50).y(this.height).addX(-178).addY(-40).flush(), true);

this.buttonList.add(this.npcDialogue);

+ 6
- 6
src/main/java/com/gildedgames/aether/client/gui/dialog/GuiShopBuy.java View File

@@ -7,12 +7,12 @@ import com.gildedgames.aether.client.gui.IExtendedGui;
import com.gildedgames.aether.client.gui.util.ToolTipCurrencyHelper;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.orbis_api.client.gui.util.GuiAbstractButton;
import com.gildedgames.orbis_api.client.gui.util.GuiTexture;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis_api.client.rect.Rect;
import com.gildedgames.orbis_api.util.InputHelper;
import com.gildedgames.orbis.lib.client.gui.util.GuiAbstractButton;
import com.gildedgames.orbis.lib.client.gui.util.GuiTexture;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.rect.Rect;
import com.gildedgames.orbis.lib.util.InputHelper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiScreen;

+ 706
- 707
src/main/java/com/gildedgames/aether/client/gui/dialog/GuiTrade.java
File diff suppressed because it is too large
View File


+ 10
- 10
src/main/java/com/gildedgames/aether/client/gui/misc/GuiAetherLoading.java View File

@@ -3,16 +3,16 @@ package com.gildedgames.aether.client.gui.misc;
import com.gildedgames.aether.client.ClientEventHandler;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.util.helpers.MathUtil;
import com.gildedgames.orbis_api.client.PartialTicks;
import com.gildedgames.orbis_api.client.gui.data.Text;
import com.gildedgames.orbis_api.client.gui.util.GuiText;
import com.gildedgames.orbis_api.client.gui.util.GuiTexture;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiViewer;
import com.gildedgames.orbis_api.client.gui.util.gui_library.IGuiContext;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis_api.client.rect.Pos2D;
import com.gildedgames.orbis_api.util.InputHelper;
import com.gildedgames.orbis.lib.client.PartialTicks;
import com.gildedgames.orbis.lib.client.gui.data.Text;
import com.gildedgames.orbis.lib.client.gui.util.GuiText;
import com.gildedgames.orbis.lib.client.gui.util.GuiTexture;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiViewer;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.IGuiContext;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.rect.Pos2D;
import com.gildedgames.orbis.lib.util.InputHelper;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper;

+ 11
- 11
src/main/java/com/gildedgames/aether/client/gui/misc/GuiAetherTeleporterNotice.java View File

@@ -2,17 +2,17 @@ package com.gildedgames.aether.client.gui.misc;

import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.blocks.BlocksAether;
import com.gildedgames.orbis_api.client.gui.data.Text;
import com.gildedgames.orbis_api.client.gui.util.GuiText;
import com.gildedgames.orbis_api.client.gui.util.GuiTextBox;
import com.gildedgames.orbis_api.client.gui.util.GuiTexture;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiViewer;
import com.gildedgames.orbis_api.client.gui.util.gui_library.IGuiContext;
import com.gildedgames.orbis_api.client.gui.util.vanilla.GuiButtonVanilla;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis_api.client.rect.Pos2D;
import com.gildedgames.orbis_api.util.InputHelper;
import com.gildedgames.orbis.lib.client.gui.data.Text;
import com.gildedgames.orbis.lib.client.gui.util.GuiText;
import com.gildedgames.orbis.lib.client.gui.util.GuiTextBox;
import com.gildedgames.orbis.lib.client.gui.util.GuiTexture;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiViewer;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.IGuiContext;
import com.gildedgames.orbis.lib.client.gui.util.vanilla.GuiButtonVanilla;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.rect.Pos2D;
import com.gildedgames.orbis.lib.util.InputHelper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;

+ 11
- 11
src/main/java/com/gildedgames/aether/client/gui/misc/GuiIntro.java View File

@@ -8,17 +8,17 @@ import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.aether.common.network.NetworkingAether;
import com.gildedgames.aether.common.network.packets.PacketCancelIntro;
import com.gildedgames.aether.common.network.packets.PacketSetPlayedIntro;
import com.gildedgames.orbis_api.client.gui.data.Text;
import com.gildedgames.orbis_api.client.gui.util.GuiText;
import com.gildedgames.orbis_api.client.gui.util.GuiTextBox;
import com.gildedgames.orbis_api.client.gui.util.GuiTexture;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiViewerNoContainer;
import com.gildedgames.orbis_api.client.gui.util.gui_library.IGuiContext;
import com.gildedgames.orbis_api.client.gui.util.vanilla.GuiButtonVanilla;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis_api.client.rect.Pos2D;
import com.gildedgames.orbis_api.util.InputHelper;
import com.gildedgames.orbis.lib.client.gui.data.Text;
import com.gildedgames.orbis.lib.client.gui.util.GuiText;
import com.gildedgames.orbis.lib.client.gui.util.GuiTextBox;
import com.gildedgames.orbis.lib.client.gui.util.GuiTexture;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiViewerNoContainer;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.IGuiContext;
import com.gildedgames.orbis.lib.client.gui.util.vanilla.GuiButtonVanilla;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.rect.Pos2D;
import com.gildedgames.orbis.lib.util.InputHelper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n;

+ 6
- 6
src/main/java/com/gildedgames/aether/client/gui/misc/GuiPatronRewardEntry.java View File

@@ -1,12 +1,12 @@
package com.gildedgames.aether.client.gui.misc;

import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.orbis_api.client.gui.data.Text;
import com.gildedgames.orbis_api.client.gui.util.GuiAbstractButton;
import com.gildedgames.orbis_api.client.gui.util.GuiText;
import com.gildedgames.orbis_api.client.gui.util.GuiTexture;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.gui.data.Text;
import com.gildedgames.orbis.lib.client.gui.util.GuiAbstractButton;
import com.gildedgames.orbis.lib.client.gui.util.GuiText;
import com.gildedgames.orbis.lib.client.gui.util.GuiTexture;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.TextComponentString;

+ 14
- 14
src/main/java/com/gildedgames/aether/client/gui/misc/GuiPatronRewards.java View File

@@ -8,20 +8,20 @@ import com.gildedgames.aether.common.capabilities.entity.player.modules.PlayerPa
import com.gildedgames.aether.common.patron.PatronChoices;
import com.gildedgames.aether.common.patron.PatronRewards;
import com.gildedgames.aether.common.patron.armor.PatronRewardArmor;
import com.gildedgames.orbis_api.client.gui.data.Text;
import com.gildedgames.orbis_api.client.gui.data.list.IListNavigator;
import com.gildedgames.orbis_api.client.gui.data.list.IListNavigatorListener;
import com.gildedgames.orbis_api.client.gui.data.list.ListNavigator;
import com.gildedgames.orbis_api.client.gui.util.GuiAbstractButton;
import com.gildedgames.orbis_api.client.gui.util.GuiText;
import com.gildedgames.orbis_api.client.gui.util.GuiTexture;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiViewer;
import com.gildedgames.orbis_api.client.gui.util.gui_library.IGuiContext;
import com.gildedgames.orbis_api.client.gui.util.list.GuiListViewer;
import com.gildedgames.orbis_api.client.rect.Dim2D;
import com.gildedgames.orbis_api.client.rect.Pos2D;
import com.gildedgames.orbis_api.util.InputHelper;
import com.gildedgames.orbis.lib.client.gui.data.Text;
import com.gildedgames.orbis.lib.client.gui.data.list.IListNavigator;
import com.gildedgames.orbis.lib.client.gui.data.list.IListNavigatorListener;
import com.gildedgames.orbis.lib.client.gui.data.list.ListNavigator;
import com.gildedgames.orbis.lib.client.gui.util.GuiAbstractButton;
import com.gildedgames.orbis.lib.client.gui.util.GuiText;
import com.gildedgames.orbis.lib.client.gui.util.GuiTexture;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiViewer;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.IGuiContext;
import com.gildedgames.orbis.lib.client.gui.util.list.GuiListViewer;
import com.gildedgames.orbis.lib.client.rect.Dim2D;
import com.gildedgames.orbis.lib.client.rect.Pos2D;
import com.gildedgames.orbis.lib.util.InputHelper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.ResourceLocation;

+ 3
- 3
src/main/java/com/gildedgames/aether/client/gui/util/GuiItemStack.java View File

@@ -1,9 +1,9 @@
package com.gildedgames.aether.client.gui.util;

import com.gildedgames.aether.client.gui.IExtendedGui;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis_api.client.rect.Rect;
import com.gildedgames.orbis_api.util.InputHelper;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiElement;
import com.gildedgames.orbis.lib.client.rect.Rect;
import com.gildedgames.orbis.lib.util.InputHelper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiScreen;

+ 0
- 4
src/main/java/com/gildedgames/aether/client/models/entities/living/ModelZephyr.java View File

@@ -1,9 +1,5 @@
package com.gildedgames.aether.client.models.entities.living;

import com.gildedgames.aether.common.entities.living.mobs.EntityZephyr;
import com.gildedgames.aether.common.util.helpers.MathUtil;
import com.gildedgames.orbis_api.util.mc.GlUtil;
import net.minecraft.util.math.Vec3d;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.GlStateManager;

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

@@ -10,7 +10,7 @@ import com.gildedgames.aether.client.models.entities.player.LayerHeadShadow;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.aether.common.patron.armor.PatronRewardArmor;
import com.gildedgames.aether.common.util.helpers.EntityUtil;
import com.gildedgames.orbis_api.util.InputHelper;
import com.gildedgames.orbis.lib.util.InputHelper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.renderer.GlStateManager;

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

@@ -4,7 +4,6 @@ import com.gildedgames.aether.client.models.entities.living.ModelAerwhale;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.entities.living.passive.EntityAerwhale;
import com.gildedgames.aether.common.util.helpers.MathUtil;
import com.gildedgames.orbis_api.util.mc.GlUtil;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.RenderLiving;

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

@@ -4,9 +4,8 @@ import com.gildedgames.aether.client.models.entities.living.ModelZephyr;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.entities.living.mobs.EntityZephyr;
import com.gildedgames.aether.common.util.helpers.MathUtil;
import com.gildedgames.orbis_api.util.mc.GlUtil;
import it.unimi.dsi.fastutil.floats.FloatList;
import it.unimi.dsi.fastutil.floats.FloatListIterator;
import java.awt.Color;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
@@ -17,8 +16,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.Vec3d;

import javax.vecmath.Point3d;
import java.util.Optional;
import java.util.Stack;

public class RenderZephyr extends RenderLiving<EntityLiving>
{

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

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

import com.gildedgames.aether.api.AetherAPI;
import com.gildedgames.aether.api.AetherCapabilities;
import com.gildedgames.aether.api.effects_system.EEffectIntensity;
import com.gildedgames.aether.api.effects_system.IAetherStatusEffectIntensity;
import com.gildedgames.aether.api.effects_system.IAetherStatusEffects;
@@ -29,9 +28,9 @@ import com.gildedgames.aether.common.registry.content.DimensionsAether;
import com.gildedgames.aether.common.util.helpers.AetherHelper;
import com.gildedgames.aether.common.util.helpers.MathUtil;
import com.gildedgames.aether.common.util.helpers.PlayerUtil;
import com.gildedgames.orbis_api.preparation.IPrepManager;
import com.gildedgames.orbis_api.preparation.impl.util.PrepHelper;
import com.gildedgames.orbis_api.util.mc.BlockPosDimension;
import com.gildedgames.orbis.lib.preparation.IPrepManager;
import com.gildedgames.orbis.lib.preparation.impl.util.PrepHelper;
import com.gildedgames.orbis.lib.util.mc.BlockPosDimension;
import com.google.common.collect.Lists;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;

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

@@ -14,10 +14,10 @@ import com.gildedgames.aether.common.world.aether.biomes.magnetic_hills.Magnetic
import com.gildedgames.aether.common.world.aether.island.gen.IslandVariables;
import com.gildedgames.aether.common.world.aether.prep.PrepAether;
import com.gildedgames.aether.common.world.necromancer_tower.NecromancerTowerInstance;
import com.gildedgames.orbis_api.OrbisAPI;
import com.gildedgames.orbis_api.util.io.IClassSerializer;
import com.gildedgames.orbis_api.util.io.Instantiator;
import com.gildedgames.orbis_api.util.io.SimpleSerializer;
import com.gildedgames.orbis.lib.OrbisLib;
import com.gildedgames.orbis.lib.util.io.IClassSerializer;
import com.gildedgames.orbis.lib.util.io.Instantiator;
import com.gildedgames.orbis.lib.util.io.SimpleSerializer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -73,11 +73,11 @@ public class CommonProxy implements IAetherServices
s.register(9, ShopCurrencyPlumproot.class, new Instantiator<>(ShopCurrencyPlumproot.class));
s.register(10, ShopInstanceGroup.class, new Instantiator<>(ShopInstanceGroup.class));

OrbisAPI.services().io().register(s);
OrbisLib.services().io().register(s);

this.contentRegistry.preInit();

OrbisAPI.sectors().register(new PrepAether());
OrbisLib.sectors().register(new PrepAether());
AetherAPI.content().shop().registerGlobalFilter(new ShopFilterNewYearsEdisonSale());
}


+ 1
- 1
src/main/java/com/gildedgames/aether/common/blocks/natural/plants/saplings/BlockAetherGreatrootSapling.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.blocks.natural.plants.saplings;
import com.gildedgames.aether.common.blocks.properties.BlockVariant;
import com.gildedgames.aether.common.blocks.properties.PropertyVariant;
import com.gildedgames.aether.common.registry.content.GenerationAether;
import com.gildedgames.orbis_api.core.BlueprintDefinition;
import com.gildedgames.orbis.lib.core.BlueprintDefinition;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;


+ 4
- 4
src/main/java/com/gildedgames/aether/common/blocks/natural/plants/saplings/BlockAetherSapling.java View File

@@ -4,10 +4,10 @@ import com.gildedgames.aether.common.blocks.IBlockMultiName;
import com.gildedgames.aether.common.blocks.natural.plants.BlockAetherPlant;
import com.gildedgames.aether.common.blocks.properties.BlockVariant;
import com.gildedgames.aether.common.blocks.properties.PropertyVariant;
import com.gildedgames.orbis_api.core.BlueprintDefinition;
import com.gildedgames.orbis_api.core.CreationData;
import com.gildedgames.orbis_api.core.baking.BakedBlueprint;
import com.gildedgames.orbis_api.core.util.BlueprintPlacer;
import com.gildedgames.orbis.lib.core.BlueprintDefinition;
import com.gildedgames.orbis.lib.core.CreationData;
import com.gildedgames.orbis.lib.core.baking.BakedBlueprint;
import com.gildedgames.orbis.lib.core.util.BlueprintPlacer;
import net.minecraft.block.IGrowable;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/blocks/natural/plants/saplings/BlockAetherSkyrootSapling.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.blocks.natural.plants.saplings;
import com.gildedgames.aether.common.blocks.properties.BlockVariant;
import com.gildedgames.aether.common.blocks.properties.PropertyVariant;
import com.gildedgames.aether.common.registry.content.GenerationAether;
import com.gildedgames.orbis_api.core.BlueprintDefinition;
import com.gildedgames.orbis.lib.core.BlueprintDefinition;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/blocks/natural/plants/saplings/BlockAetherUniqueSapling.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.blocks.natural.plants.saplings;
import com.gildedgames.aether.common.blocks.properties.BlockVariant;
import com.gildedgames.aether.common.blocks.properties.PropertyVariant;
import com.gildedgames.aether.common.registry.content.GenerationAether;
import com.gildedgames.orbis_api.core.BlueprintDefinition;
import com.gildedgames.orbis.lib.core.BlueprintDefinition;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/blocks/natural/plants/saplings/BlockAetherWisprootSapling.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.blocks.natural.plants.saplings;
import com.gildedgames.aether.common.blocks.properties.BlockVariant;
import com.gildedgames.aether.common.blocks.properties.PropertyVariant;
import com.gildedgames.aether.common.registry.content.GenerationAether;
import com.gildedgames.orbis_api.core.BlueprintDefinition;
import com.gildedgames.orbis.lib.core.BlueprintDefinition;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;


+ 2
- 2
src/main/java/com/gildedgames/aether/common/capabilities/entity/player/PlayerAether.java View File

@@ -8,8 +8,8 @@ import com.gildedgames.aether.common.capabilities.entity.player.modules.*;
import com.gildedgames.aether.common.network.NetworkingAether;
import com.gildedgames.aether.common.network.packets.*;
import com.gildedgames.aether.common.world.necromancer_tower.NecromancerTowerInstance;
import com.gildedgames.orbis_api.util.io.NBTFunnel;
import com.gildedgames.orbis_api.util.mc.NBTHelper;
import com.gildedgames.orbis.lib.util.io.NBTFunnel;
import com.gildedgames.orbis.lib.util.mc.NBTHelper;
import com.google.common.collect.Lists;
import net.minecraft.block.material.Material;
import net.minecraft.enchantment.EnchantmentHelper;

+ 2
- 2
src/main/java/com/gildedgames/aether/common/capabilities/entity/player/PlayerAetherHooks.java View File

@@ -13,8 +13,8 @@ import com.gildedgames.aether.common.network.packets.PacketMarkPlayerDeath;
import com.gildedgames.aether.common.network.packets.PacketRequestClientInfo;
import com.gildedgames.aether.common.registry.content.DimensionsAether;
import com.gildedgames.aether.common.util.helpers.IslandHelper;
import com.gildedgames.orbis_api.util.mc.BlockPosDimension;
import com.gildedgames.orbis_api.util.mc.BlockUtil;
import com.gildedgames.orbis.lib.util.mc.BlockPosDimension;
import com.gildedgames.orbis.lib.util.mc.BlockUtil;
import com.google.common.collect.Lists;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSnow;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/capabilities/entity/player/PlayerAetherModule.java View File

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

import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.event.entity.living.LivingDeathEvent;

+ 2
- 2
src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerCampfiresModule.java View File

@@ -2,8 +2,8 @@ package com.gildedgames.aether.common.capabilities.entity.player.modules;

import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAetherModule;
import com.gildedgames.orbis_api.util.io.NBTFunnel;
import com.gildedgames.orbis_api.util.mc.BlockPosDimension;
import com.gildedgames.orbis.lib.util.io.NBTFunnel;
import com.gildedgames.orbis.lib.util.mc.BlockPosDimension;
import com.google.common.collect.Sets;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerPreventDropsModule.java View File

@@ -4,7 +4,7 @@ import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAetherModule;
import com.gildedgames.aether.common.items.IDropOnDeath;
import com.gildedgames.aether.common.registry.content.DimensionsAether;
import com.gildedgames.orbis_api.util.io.NBTFunnel;
import com.gildedgames.orbis.lib.util.io.NBTFunnel;
import com.google.common.collect.Lists;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerProgressModule.java View File

@@ -5,7 +5,7 @@ import com.gildedgames.aether.common.capabilities.entity.player.PlayerAetherModu
import com.gildedgames.aether.common.network.NetworkingAether;
import com.gildedgames.aether.common.network.packets.PacketProgressBooleanData;
import com.gildedgames.aether.common.network.packets.PacketTalkedTo;
import com.gildedgames.orbis_api.util.io.NBTFunnel;
import com.gildedgames.orbis.lib.util.io.NBTFunnel;
import com.google.common.collect.Maps;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;

+ 5
- 5
src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerSectorModule.java View File

@@ -2,11 +2,11 @@ package com.gildedgames.aether.common.capabilities.entity.player.modules;

import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAetherModule;
import com.gildedgames.orbis_api.preparation.IPrepManager;
import com.gildedgames.orbis_api.preparation.IPrepRegistryEntry;
import com.gildedgames.orbis_api.preparation.IPrepSector;
import com.gildedgames.orbis_api.preparation.impl.util.PrepHelper;
import com.gildedgames.orbis_api.util.ChunkMap;
import com.gildedgames.orbis.lib.preparation.IPrepManager;
import com.gildedgames.orbis.lib.preparation.IPrepRegistryEntry;
import com.gildedgames.orbis.lib.preparation.IPrepSector;
import com.gildedgames.orbis.lib.preparation.impl.util.PrepHelper;
import com.gildedgames.orbis.lib.util.ChunkMap;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.common.gameevent.TickEvent;

+ 3
- 3
src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerTeleportingModule.java View File

@@ -8,9 +8,9 @@ import com.gildedgames.aether.common.capabilities.entity.player.PlayerAetherModu
import com.gildedgames.aether.common.registry.content.DimensionsAether;
import com.gildedgames.aether.common.registry.content.SoundsAether;
import com.gildedgames.aether.common.util.helpers.IslandHelper;
import com.gildedgames.orbis_api.util.TeleporterGeneric;
import com.gildedgames.orbis_api.util.io.NBTFunnel;
import com.gildedgames.orbis_api.util.mc.BlockPosDimension;
import com.gildedgames.orbis.lib.util.TeleporterGeneric;
import com.gildedgames.orbis.lib.util.io.NBTFunnel;
import com.gildedgames.orbis.lib.util.mc.BlockPosDimension;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/genes/moa/MoaGenePool.java View File

@@ -6,7 +6,7 @@ import com.gildedgames.aether.common.entities.genes.util.DataGene;
import com.gildedgames.aether.common.entities.genes.util.GenePool;
import com.gildedgames.aether.common.entities.genes.util.GeneUtil;
import com.gildedgames.aether.common.entities.genes.util.SimpleGeneStorage;
import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;
import com.google.common.collect.Lists;
import net.minecraft.nbt.NBTTagCompound;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/living/mounts/EntityMoa.java View File

@@ -16,7 +16,7 @@ import com.gildedgames.aether.common.items.misc.ItemMoaEgg;
import com.gildedgames.aether.common.items.misc.ItemMoaFeather;
import com.gildedgames.aether.common.registry.content.SoundsAether;
import com.gildedgames.aether.common.util.helpers.MathUtil;
import com.gildedgames.orbis_api.client.PartialTicks;
import com.gildedgames.orbis.lib.client.PartialTicks;
import com.google.common.collect.Sets;
import net.minecraft.block.Block;
import net.minecraft.entity.*;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/living/npc/EntityEdison.java View File

@@ -9,7 +9,7 @@ import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.aether.common.entities.util.EntityBodyHelperNoRotation;
import com.gildedgames.aether.common.shop.ShopInstanceGroup;
import com.gildedgames.orbis_api.util.mc.NBTHelper;
import com.gildedgames.orbis.lib.util.mc.NBTHelper;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityBodyHelper;
import net.minecraft.entity.SharedMonsterAttributes;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/living/npc/EntityJosediya.java View File

@@ -4,7 +4,7 @@ import com.gildedgames.aether.api.entity.EntityNPC;
import com.gildedgames.aether.api.shop.IShopInstanceGroup;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.orbis_api.util.mc.NBTHelper;
import com.gildedgames.orbis.lib.util.mc.NBTHelper;
import net.minecraft.block.Block;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAILookIdle;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/living/npc/EntityMysteriousFigure.java View File

@@ -9,7 +9,7 @@ import com.gildedgames.aether.common.AetherCelebrations;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.aether.common.shop.ShopInstanceGroup;
import com.gildedgames.orbis_api.util.mc.NBTHelper;
import com.gildedgames.orbis.lib.util.mc.NBTHelper;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityBodyHelper;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/living/npc/EntityNecromancer.java View File

@@ -5,7 +5,7 @@ import com.gildedgames.aether.api.player.IPlayerAether;
import com.gildedgames.aether.api.shop.IShopInstanceGroup;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.orbis_api.util.mc.NBTHelper;
import com.gildedgames.orbis.lib.util.mc.NBTHelper;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIWatchClosest;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/living/npc/EntityTivalier.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.entities.living.npc;
import com.gildedgames.aether.api.entity.EntityNPC;
import com.gildedgames.aether.api.shop.IShopInstanceGroup;
import com.gildedgames.aether.common.entities.util.EntityBodyHelperNoRotation;
import com.gildedgames.orbis_api.util.mc.NBTHelper;
import com.gildedgames.orbis.lib.util.mc.NBTHelper;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityBodyHelper;
import net.minecraft.entity.SharedMonsterAttributes;

+ 2
- 2
src/main/java/com/gildedgames/aether/common/entities/tiles/TileEntityOutpostCampfire.java View File

@@ -6,8 +6,8 @@ import com.gildedgames.aether.common.blocks.BlocksAether;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.aether.common.entities.tiles.multiblock.TileEntityMultiblockController;
import com.gildedgames.aether.common.registry.content.DimensionsAether;
import com.gildedgames.orbis_api.util.TeleporterGeneric;
import com.gildedgames.orbis_api.util.mc.BlockPosDimension;
import com.gildedgames.orbis.lib.util.TeleporterGeneric;
import com.gildedgames.orbis.lib.util.mc.BlockPosDimension;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;

+ 2
- 2
src/main/java/com/gildedgames/aether/common/entities/tiles/TileEntitySchematicBlock.java View File

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

import com.gildedgames.orbis_api.processing.BlockAccessExtendedWrapper;
import com.gildedgames.orbis_api.processing.IBlockAccessExtended;
import com.gildedgames.orbis.lib.processing.BlockAccessExtendedWrapper;
import com.gildedgames.orbis.lib.processing.IBlockAccessExtended;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;

+ 6
- 6
src/main/java/com/gildedgames/aether/common/entities/tiles/TileEntityTeleporter.java View File

@@ -14,11 +14,11 @@ import com.gildedgames.aether.common.registry.content.DimensionsAether;
import com.gildedgames.aether.common.registry.content.InstancesAether;
import com.gildedgames.aether.common.util.helpers.AetherHelper;
import com.gildedgames.aether.common.world.necromancer_tower.NecromancerTowerInstanceHelper;
import com.gildedgames.orbis_api.OrbisAPI;
import com.gildedgames.orbis_api.util.TeleporterGeneric;
import com.gildedgames.orbis_api.util.mc.BlockPosDimension;
import com.gildedgames.orbis_api.world.instances.IInstance;
import com.gildedgames.orbis_api.world.instances.IPlayerInstances;
import com.gildedgames.orbis.lib.OrbisLib;
import com.gildedgames.orbis.lib.util.TeleporterGeneric;
import com.gildedgames.orbis.lib.util.mc.BlockPosDimension;
import com.gildedgames.orbis.lib.world.instances.IInstance;
import com.gildedgames.orbis.lib.world.instances.IPlayerInstances;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -161,7 +161,7 @@ public class TileEntityTeleporter extends TileEntityMultiblockController impleme
final NecromancerTowerInstanceHelper handler = InstancesAether.NECROMANCER_TOWER_HANDLER;

final PlayerAether playerAether = PlayerAether.getPlayer(player);
final IPlayerInstances hook = OrbisAPI.instances().getPlayer(player);
final IPlayerInstances hook = OrbisLib.instances().getPlayer(player);

if (playerAether.getTeleportingModule().getAetherPos() != null)
{

+ 2
- 2
src/main/java/com/gildedgames/aether/common/entities/tiles/TileEntityWildcard.java View File

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

import com.gildedgames.aether.common.blocks.BlocksAether;
import com.gildedgames.orbis_api.processing.IBlockAccessExtended;
import com.gildedgames.orbis_api.util.mc.BlockUtil;
import com.gildedgames.orbis.lib.processing.IBlockAccessExtended;
import com.gildedgames.orbis.lib.util.mc.BlockUtil;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/tiles/multiblock/TileEntityMultiblockDummy.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.entities.tiles.multiblock;
import com.gildedgames.aether.api.world.IWorldObjectHoverable;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.entities.tiles.util.TileEntitySynced;
import com.gildedgames.orbis_api.util.mc.NBTHelper;
import com.gildedgames.orbis.lib.util.mc.NBTHelper;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/entities/util/MoaNest.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.entities.util;
import com.gildedgames.aether.common.blocks.BlocksAether;
import com.gildedgames.aether.common.entities.genes.util.GeneUtil;
import com.gildedgames.aether.common.entities.living.mounts.EntityMoa;
import com.gildedgames.orbis_api.util.mc.NBTHelper;
import com.gildedgames.orbis.lib.util.mc.NBTHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/network/AetherGuiHandler.java View File

@@ -20,7 +20,7 @@ import com.gildedgames.aether.common.containers.tiles.ContainerIcestoneCooler;
import com.gildedgames.aether.common.containers.tiles.ContainerIncubator;
import com.gildedgames.aether.common.containers.tiles.ContainerMasonryBench;
import com.gildedgames.aether.common.dialog.DialogUtil;
import com.gildedgames.orbis_api.client.gui.util.gui_library.GuiViewer;
import com.gildedgames.orbis.lib.client.gui.util.gui_library.GuiViewer;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.gui.inventory.GuiCrafting;
import net.minecraft.entity.player.EntityPlayer;

+ 2
- 2
src/main/java/com/gildedgames/aether/common/network/packets/PacketCampfires.java View File

@@ -2,8 +2,8 @@ package com.gildedgames.aether.common.network.packets;

import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.aether.common.network.MessageHandlerClient;
import com.gildedgames.orbis_api.util.io.NBTFunnel;
import com.gildedgames.orbis_api.util.mc.BlockPosDimension;
import com.gildedgames.orbis.lib.util.io.NBTFunnel;
import com.gildedgames.orbis.lib.util.mc.BlockPosDimension;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;

+ 4
- 4
src/main/java/com/gildedgames/aether/common/network/packets/PacketCancelIntro.java View File

@@ -3,9 +3,9 @@ package com.gildedgames.aether.common.network.packets;
import com.gildedgames.aether.common.network.MessageHandlerServer;
import com.gildedgames.aether.common.registry.content.InstancesAether;
import com.gildedgames.aether.common.world.necromancer_tower.NecromancerTowerInstanceHelper;
import com.gildedgames.orbis_api.OrbisAPI;
import com.gildedgames.orbis_api.world.instances.IInstance;
import com.gildedgames.orbis_api.world.instances.IPlayerInstances;
import com.gildedgames.orbis.lib.OrbisLib;
import com.gildedgames.orbis.lib.world.instances.IInstance;
import com.gildedgames.orbis.lib.world.instances.IPlayerInstances;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -43,7 +43,7 @@ public class PacketCancelIntro implements IMessage

final NecromancerTowerInstanceHelper handler = InstancesAether.NECROMANCER_TOWER_HANDLER;

final IPlayerInstances hook = OrbisAPI.instances().getPlayer(player);
final IPlayerInstances hook = OrbisLib.instances().getPlayer(player);

if (hook.getInstance() != null)
{

+ 1
- 1
src/main/java/com/gildedgames/aether/common/network/packets/dialog/PacketConditionsMetData.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.network.packets.dialog;
import com.gildedgames.aether.api.player.IPlayerAether;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.aether.common.network.MessageHandlerClient;
import com.gildedgames.orbis_api.util.io.NBTFunnel;
import com.gildedgames.orbis.lib.util.io.NBTFunnel;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/network/packets/dialog/PacketOpenDialog.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.network.packets.dialog;
import com.gildedgames.aether.api.player.IPlayerAether;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.aether.common.network.MessageHandlerClient;
import com.gildedgames.orbis_api.util.io.NBTFunnel;
import com.gildedgames.orbis.lib.util.io.NBTFunnel;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/patron/PatronChoices.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.patron;
import com.gildedgames.aether.api.patron.PatronRewardRegistry;
import com.gildedgames.aether.common.capabilities.entity.player.modules.PlayerPatronRewards;
import com.gildedgames.aether.common.patron.armor.PatronRewardArmor;
import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;
import net.minecraft.nbt.NBTTagCompound;

public class PatronChoices implements NBT

+ 5
- 5
src/main/java/com/gildedgames/aether/common/registry/ContentRegistry.java View File

@@ -16,9 +16,9 @@ import com.gildedgames.aether.common.recipes.simple.RecipeWrapper;
import com.gildedgames.aether.common.registry.content.*;
import com.gildedgames.aether.common.shop.ShopManager;
import com.gildedgames.aether.common.util.helpers.PerfHelper;
import com.gildedgames.orbis_api.IOrbisServicesListener;
import com.gildedgames.orbis_api.OrbisAPI;
import com.gildedgames.orbis_api.data.management.IProjectManager;
import com.gildedgames.orbis.lib.IOrbisServicesListener;
import com.gildedgames.orbis.lib.OrbisLib;
import com.gildedgames.orbis.lib.data.management.IProjectManager;
import net.minecraft.item.Item;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.ResourceLocation;
@@ -53,7 +53,7 @@ public class ContentRegistry implements IContentRegistry, IOrbisServicesListener
*/
public void preInit()
{
OrbisAPI.services().listen(this);
OrbisLib.services().listen(this);

PerfHelper.measure("Pre-initialize tiles", TileEntitiesAether::preInit);
PerfHelper.measure("Pre-initialize dimensions", DimensionsAether::preInit);
@@ -93,7 +93,7 @@ public class ContentRegistry implements IContentRegistry, IOrbisServicesListener
*/
public void onServerAboutToStart()
{
PerfHelper.measure("Verify Orbis project manager", OrbisAPI.services()::verifyProjectManagerStarted);
PerfHelper.measure("Verify Orbis project manager", OrbisLib.services()::verifyProjectManagerStarted);
PerfHelper.measure("Load generation", GenerationAether::load);
}


+ 5
- 5
src/main/java/com/gildedgames/aether/common/registry/content/BlueprintsAether.java View File

@@ -1,10 +1,10 @@
package com.gildedgames.aether.common.registry.content;

import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.orbis_api.OrbisAPI;
import com.gildedgames.orbis_api.data.blueprint.BlueprintData;
import com.gildedgames.orbis_api.data.management.IProject;
import com.gildedgames.orbis_api.data.management.IProjectManager;
import com.gildedgames.orbis.lib.OrbisLib;
import com.gildedgames.orbis.lib.data.blueprint.BlueprintData;
import com.gildedgames.orbis.lib.data.management.IProject;
import com.gildedgames.orbis.lib.data.management.IProjectManager;
import net.minecraft.util.ResourceLocation;

import java.util.Optional;
@@ -83,7 +83,7 @@ public class BlueprintsAether
{
ResourceLocation location = AetherCore.getResource("aetherii");

project = OrbisAPI.services().loadProject(null, location, AetherCore.INSTANCE, "aether_ii");
project = OrbisLib.services().loadProject(null, location, AetherCore.INSTANCE, "aether_ii");

projectManager.cacheProject(location.getPath(), project);


+ 11
- 11
src/main/java/com/gildedgames/aether/common/registry/content/GenerationAether.java View File

@@ -12,16 +12,16 @@ import com.gildedgames.aether.common.world.aether.features.aerclouds.WorldGenAer
import com.gildedgames.aether.common.world.templates.conditions.TemplateConditions;
import com.gildedgames.aether.common.world.templates.post.PostPlacementMoaFamily;
import com.gildedgames.aether.common.world.util.GenUtil;
import com.gildedgames.orbis_api.OrbisAPI;
import com.gildedgames.orbis_api.core.BlueprintDefinition;
import com.gildedgames.orbis_api.core.BlueprintDefinitionPool;
import com.gildedgames.orbis_api.core.PlacementCondition;
import com.gildedgames.orbis_api.core.conditions.PlacementConditionAvoidBlock;
import com.gildedgames.orbis_api.core.conditions.PlacementConditionOnBlock;
import com.gildedgames.orbis_api.core.conditions.PlacementConditionReplaceableMaterials;
import com.gildedgames.orbis_api.core.registry.IOrbisDefinitionRegistry;
import com.gildedgames.orbis_api.core.registry.OrbisDefinitionRegistry;
import com.gildedgames.orbis_api.processing.CenterOffsetProcessor;
import com.gildedgames.orbis.lib.OrbisLib;
import com.gildedgames.orbis.lib.core.BlueprintDefinition;
import com.gildedgames.orbis.lib.core.BlueprintDefinitionPool;
import com.gildedgames.orbis.lib.core.PlacementCondition;
import com.gildedgames.orbis.lib.core.conditions.PlacementConditionAvoidBlock;
import com.gildedgames.orbis.lib.core.conditions.PlacementConditionOnBlock;
import com.gildedgames.orbis.lib.core.conditions.PlacementConditionReplaceableMaterials;
import com.gildedgames.orbis.lib.core.registry.IOrbisDefinitionRegistry;
import com.gildedgames.orbis.lib.core.registry.OrbisDefinitionRegistry;
import com.gildedgames.orbis.lib.processing.CenterOffsetProcessor;
import net.minecraft.block.material.Material;
import net.minecraft.util.Rotation;
import net.minecraft.util.math.BlockPos;
@@ -165,7 +165,7 @@ public class GenerationAether

private static void registerBlueprints()
{
OrbisAPI.services().register(registry);
OrbisLib.services().register(registry);

final PlacementCondition avoidQuicksoil = new PlacementConditionAvoidBlock(BlocksAether.quicksoil);
final PlacementCondition isReplaceableGround = new PlacementConditionReplaceableMaterials(Material.GROUND, Material.GRASS);

+ 2
- 2
src/main/java/com/gildedgames/aether/common/registry/content/InstancesAether.java View File

@@ -2,7 +2,7 @@ package com.gildedgames.aether.common.registry.content;

import com.gildedgames.aether.common.world.necromancer_tower.NecromancerTowerInstanceFactory;
import com.gildedgames.aether.common.world.necromancer_tower.NecromancerTowerInstanceHelper;
import com.gildedgames.orbis_api.OrbisAPI;
import com.gildedgames.orbis.lib.OrbisLib;

public class InstancesAether
{
@@ -12,6 +12,6 @@ public class InstancesAether
{
final NecromancerTowerInstanceFactory factory = new NecromancerTowerInstanceFactory(DimensionsAether.NECROMANCER_TOWER);

NECROMANCER_TOWER_HANDLER = new NecromancerTowerInstanceHelper(OrbisAPI.instances().createInstanceHandler(factory));
NECROMANCER_TOWER_HANDLER = new NecromancerTowerInstanceHelper(OrbisLib.instances().createInstanceHandler(factory));
}
}

+ 1
- 1
src/main/java/com/gildedgames/aether/common/shop/ShopBuy.java View File

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

import com.gildedgames.aether.api.shop.IShopBuy;
import com.gildedgames.orbis_api.util.io.NBTFunnel;
import com.gildedgames.orbis.lib.util.io.NBTFunnel;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/shop/ShopCurrencyGilt.java View File

@@ -5,7 +5,7 @@ import com.gildedgames.aether.api.shop.ICurrencyListener;
import com.gildedgames.aether.api.shop.IGuiCurrencyValue;
import com.gildedgames.aether.api.shop.IShopCurrency;
import com.gildedgames.aether.client.gui.dialog.GuiCoinsContainer;
import com.gildedgames.orbis_api.client.rect.Rect;
import com.gildedgames.orbis.lib.client.rect.Rect;
import net.minecraft.nbt.NBTTagCompound;

public class ShopCurrencyGilt implements IShopCurrency

+ 1
- 1
src/main/java/com/gildedgames/aether/common/shop/ShopCurrencyPlumproot.java View File

@@ -7,7 +7,7 @@ import com.gildedgames.aether.api.shop.IShopCurrency;
import com.gildedgames.aether.client.gui.dialog.GuiPumpkinCurrency;
import com.gildedgames.aether.common.blocks.BlocksAether;
import com.gildedgames.aether.common.blocks.natural.plants.BlockPlumproot;
import com.gildedgames.orbis_api.client.rect.Rect;
import com.gildedgames.orbis.lib.client.rect.Rect;
import com.google.common.collect.Lists;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/shop/ShopInstance.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.shop;
import com.gildedgames.aether.api.shop.IShopBuy;
import com.gildedgames.aether.api.shop.IShopCurrency;
import com.gildedgames.aether.api.shop.IShopInstance;
import com.gildedgames.orbis_api.util.io.NBTFunnel;
import com.gildedgames.orbis.lib.util.io.NBTFunnel;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import net.minecraft.entity.player.EntityPlayer;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/shop/ShopInstanceGroup.java View File

@@ -2,7 +2,7 @@ package com.gildedgames.aether.common.shop;

import com.gildedgames.aether.api.shop.IShopInstance;
import com.gildedgames.aether.api.shop.IShopInstanceGroup;
import com.gildedgames.orbis_api.util.io.NBTFunnel;
import com.gildedgames.orbis.lib.util.io.NBTFunnel;
import com.google.common.collect.Maps;
import net.minecraft.nbt.NBTTagCompound;


+ 1
- 1
src/main/java/com/gildedgames/aether/common/shop/ShopInventory.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.shop;
import com.gildedgames.aether.api.AetherAPI;
import com.gildedgames.aether.api.shop.IShopBuy;
import com.gildedgames.aether.common.util.helpers.ItemHelper;
import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ItemStackHelper;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/util/helpers/AetherHelper.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.common.util.helpers;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.registry.content.DimensionsAether;
import com.gildedgames.aether.common.registry.content.InstancesAether;
import com.gildedgames.orbis_api.world.instances.IInstance;
import com.gildedgames.orbis.lib.world.instances.IInstance;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;


+ 2
- 2
src/main/java/com/gildedgames/aether/common/util/helpers/IslandHelper.java View File

@@ -3,8 +3,8 @@ package com.gildedgames.aether.common.util.helpers;
import com.gildedgames.aether.api.world.islands.IIslandData;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.world.aether.prep.PrepSectorDataAether;
import com.gildedgames.orbis_api.preparation.IPrepSector;
import com.gildedgames.orbis_api.preparation.impl.util.PrepHelper;
import com.gildedgames.orbis.lib.preparation.IPrepSector;
import com.gildedgames.orbis.lib.preparation.impl.util.PrepHelper;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;


+ 9
- 9
src/main/java/com/gildedgames/aether/common/world/aether/ChunkGeneratorAether.java View File

@@ -5,15 +5,15 @@ import com.gildedgames.aether.api.world.islands.IIslandChunkColumnInfo;
import com.gildedgames.aether.api.world.islands.IIslandData;
import com.gildedgames.aether.common.util.helpers.IslandHelper;
import com.gildedgames.aether.common.world.aether.chunk.AetherChunkColumnInfo;
import com.gildedgames.orbis_api.core.PlacedBlueprint;
import com.gildedgames.orbis_api.data.region.IRegion;
import com.gildedgames.orbis_api.data.region.Region;
import com.gildedgames.orbis_api.preparation.IChunkMaskTransformer;
import com.gildedgames.orbis_api.preparation.impl.ChunkDataContainer;
import com.gildedgames.orbis_api.preparation.impl.ChunkMask;
import com.gildedgames.orbis_api.processing.BlockAccessChunkDataContainer;
import com.gildedgames.orbis_api.processing.DataPrimer;
import com.gildedgames.orbis_api.util.random.XoRoShiRoRandom;
import com.gildedgames.orbis.lib.core.PlacedBlueprint;
import com.gildedgames.orbis.lib.data.region.IRegion;
import com.gildedgames.orbis.lib.data.region.Region;
import com.gildedgames.orbis.lib.preparation.IChunkMaskTransformer;
import com.gildedgames.orbis.lib.preparation.impl.ChunkDataContainer;
import com.gildedgames.orbis.lib.preparation.impl.ChunkMask;
import com.gildedgames.orbis.lib.processing.BlockAccessChunkDataContainer;
import com.gildedgames.orbis.lib.processing.DataPrimer;
import com.gildedgames.orbis.lib.util.random.XoRoShiRoRandom;
import net.minecraft.entity.EnumCreatureType;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

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

@@ -10,9 +10,9 @@ import com.gildedgames.aether.common.world.aether.biomes.arctic_peaks.BiomeArcti
import com.gildedgames.aether.common.world.aether.features.WorldGenUndergroundVeins;
import com.gildedgames.aether.common.world.aether.features.caves.WorldGenAetherCaves;
import com.gildedgames.aether.common.world.aether.island.gen.IslandBlockType;
import com.gildedgames.orbis_api.preparation.impl.ChunkMask;
import com.gildedgames.orbis_api.processing.BlockAccessExtendedWrapper;
import com.gildedgames.orbis_api.processing.IBlockAccessExtended;
import com.gildedgames.orbis.lib.preparation.impl.ChunkMask;
import com.gildedgames.orbis.lib.processing.BlockAccessExtendedWrapper;
import com.gildedgames.orbis.lib.processing.IBlockAccessExtended;
import net.minecraft.world.World;

/**

+ 1
- 1
src/main/java/com/gildedgames/aether/common/world/aether/biomes/BiomeAetherBase.java View File

@@ -4,7 +4,7 @@ import com.gildedgames.aether.api.world.generation.WorldDecoration;
import com.gildedgames.aether.api.world.islands.IIslandData;
import com.gildedgames.aether.api.world.islands.IIslandGenerator;
import com.gildedgames.aether.common.blocks.BlocksAether;
import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;

+ 10
- 10
src/main/java/com/gildedgames/aether/common/world/aether/biomes/BiomeAetherDecorator.java View File

@@ -21,16 +21,16 @@ import com.gildedgames.aether.common.world.aether.features.aerclouds.WorldGenPur
import com.gildedgames.aether.common.world.aether.features.trees.WorldGenOrangeTree;
import com.gildedgames.aether.common.world.aether.island.data.BlockAccessIsland;
import com.gildedgames.aether.common.world.templates.TemplatePlacer;
import com.gildedgames.orbis_api.core.BlueprintDefinition;
import com.gildedgames.orbis_api.core.BlueprintDefinitionPool;
import com.gildedgames.orbis_api.core.CreationData;
import com.gildedgames.orbis_api.core.PlacedBlueprint;
import com.gildedgames.orbis_api.core.baking.BakedBlueprint;
import com.gildedgames.orbis_api.core.util.BlueprintPlacer;
import com.gildedgames.orbis_api.data.schedules.ScheduleRegion;
import com.gildedgames.orbis_api.processing.DataPrimer;
import com.gildedgames.orbis_api.processing.IBlockAccessExtended;
import com.gildedgames.orbis_api.world.WorldSlice;
import com.gildedgames.orbis.lib.core.BlueprintDefinition;
import com.gildedgames.orbis.lib.core.BlueprintDefinitionPool;
import com.gildedgames.orbis.lib.core.CreationData;
import com.gildedgames.orbis.lib.core.PlacedBlueprint;
import com.gildedgames.orbis.lib.core.baking.BakedBlueprint;
import com.gildedgames.orbis.lib.core.util.BlueprintPlacer;
import com.gildedgames.orbis.lib.data.schedules.ScheduleRegion;
import com.gildedgames.orbis.lib.processing.DataPrimer;
import com.gildedgames.orbis.lib.processing.IBlockAccessExtended;
import com.gildedgames.orbis.lib.world.WorldSlice;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.Rotation;
import net.minecraft.util.math.BlockPos;

+ 4
- 4
src/main/java/com/gildedgames/aether/common/world/aether/biomes/BiomeProviderAether.java View File

@@ -2,10 +2,10 @@ package com.gildedgames.aether.common.world.aether.biomes;

import com.gildedgames.aether.common.registry.content.BiomesAether;
import com.gildedgames.aether.common.world.aether.prep.PrepSectorDataAether;
import com.gildedgames.orbis_api.preparation.IPrepManager;
import com.gildedgames.orbis_api.preparation.IPrepSector;
import com.gildedgames.orbis_api.preparation.IPrepSectorAccess;
import com.gildedgames.orbis_api.preparation.impl.util.PrepHelper;
import com.gildedgames.orbis.lib.preparation.IPrepManager;
import com.gildedgames.orbis.lib.preparation.IPrepSector;
import com.gildedgames.orbis.lib.preparation.IPrepSectorAccess;
import com.gildedgames.orbis.lib.preparation.impl.util.PrepHelper;
import com.google.common.collect.Lists;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

+ 1
- 1
src/main/java/com/gildedgames/aether/common/world/aether/biomes/BiomeVoid.java View File

@@ -5,7 +5,7 @@ import com.gildedgames.aether.api.world.islands.IIslandData;
import com.gildedgames.aether.api.world.islands.IIslandGenerator;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.blocks.BlocksAether;
import com.gildedgames.orbis_api.util.mc.NBT;
import com.gildedgames.orbis.lib.util.mc.NBT;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

+ 0
- 0
src/main/java/com/gildedgames/aether/common/world/aether/biomes/arctic_peaks/BiomeArcticPeaks.java View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save