Version 1.1.6

Support for Aether Legacy 3.2 - which seems to have undone the 'universal' refactoring of 3.1. Maybe it was accidental that it was universal?
Shnupbups · Jul 27, 2018 · 8e2e80e · 8e2e80e
1 parent 55a7ce8
commit 8e2e80e
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 22 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "1.1.5"
+version = "1.1.6"
 group = "shnupbups.tinkersaether" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "tinkersaether"
 

diff --git a/libs/aether_legacy-v3.1.jar → libs/aether_legacy-1.12.2-v3.2.jar b/libs/aether_legacy-v3.1.jar → libs/aether_legacy-1.12.2-v3.2.jar
diff --git a/src/main/java/shnupbups/tinkersaether/TinkersAether.java b/src/main/java/shnupbups/tinkersaether/TinkersAether.java
@@ -27,11 +27,11 @@
 import slimeknights.tconstruct.library.materials.BowMaterialStats;
 import slimeknights.tconstruct.tools.TinkerMaterials;
 
-@Mod(modid = TinkersAether.modid, name = TinkersAether.name, version = TinkersAether.version, acceptedMinecraftVersions = "[1.12.2]", dependencies = "required-after:mantle;required-after:tconstruct;required-after:aether_legacy@[1.12.2-v3.1,);")
+@Mod(modid = TinkersAether.modid, name = TinkersAether.name, version = TinkersAether.version, acceptedMinecraftVersions = "[1.12.2]", dependencies = "required-after:mantle;required-after:tconstruct;required-after:aether_legacy@[1.12.2-v3.2,);")
 public class TinkersAether {
     public static final String modid = "tinkersaether";
     public static final String name = "Tinkers Aether";
-    public static final String version = "1.1.5";
+    public static final String version = "1.1.6";
 
     @Mod.Instance(modid)
     public static TinkersAether instance;

diff --git a/src/main/java/shnupbups/tinkersaether/blocks/TABlock.java b/src/main/java/shnupbups/tinkersaether/blocks/TABlock.java
@@ -1,6 +1,6 @@
 package shnupbups.tinkersaether.blocks;
 
-import com.legacy.aether.mc1122.registry.creative_tabs.AetherCreativeTabs;
+import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.util.math.BlockPos;

diff --git a/src/main/java/shnupbups/tinkersaether/items/TAItem.java b/src/main/java/shnupbups/tinkersaether/items/TAItem.java
@@ -1,6 +1,6 @@
 package shnupbups.tinkersaether.items;
 
-import com.legacy.aether.mc1122.registry.creative_tabs.AetherCreativeTabs;
+import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import shnupbups.tinkersaether.TinkersAether;

diff --git a/src/main/java/shnupbups/tinkersaether/misc/OreDict.java b/src/main/java/shnupbups/tinkersaether/misc/OreDict.java
@@ -1,7 +1,7 @@
 package shnupbups.tinkersaether.misc;
 
-import com.legacy.aether.mc1122.blocks.BlocksAether;
-import com.legacy.aether.mc1122.items.ItemsAether;
+import com.legacy.aether.blocks.BlocksAether;
+import com.legacy.aether.items.ItemsAether;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 

diff --git a/src/main/java/shnupbups/tinkersaether/tools/ToolDartShooter.java b/src/main/java/shnupbups/tinkersaether/tools/ToolDartShooter.java
@@ -1,10 +1,10 @@
 package shnupbups.tinkersaether.tools;
 
 import com.google.common.collect.ImmutableList;
-import com.legacy.aether.mc1122.entities.projectile.darts.EntityDartEnchanted;
-import com.legacy.aether.mc1122.entities.projectile.darts.EntityDartGolden;
-import com.legacy.aether.mc1122.entities.projectile.darts.EntityDartPoison;
-import com.legacy.aether.mc1122.items.ItemsAether;
+import com.legacy.aether.entities.projectile.darts.EntityDartEnchanted;
+import com.legacy.aether.entities.projectile.darts.EntityDartGolden;
+import com.legacy.aether.entities.projectile.darts.EntityDartPoison;
+import com.legacy.aether.items.ItemsAether;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;

diff --git a/src/main/java/shnupbups/tinkersaether/traits/Antigrav.java b/src/main/java/shnupbups/tinkersaether/traits/Antigrav.java
@@ -1,6 +1,6 @@
 package shnupbups.tinkersaether.traits;
 
-import com.legacy.aether.mc1122.entities.block.EntityFloatingBlock;
+import com.legacy.aether.entities.block.EntityFloatingBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.BlockPos;

diff --git a/src/main/java/shnupbups/tinkersaether/traits/Enlightened.java b/src/main/java/shnupbups/tinkersaether/traits/Enlightened.java
@@ -1,6 +1,6 @@
 package shnupbups.tinkersaether.traits;
 
-import com.legacy.aether.mc1122.items.ItemsAether;
+import com.legacy.aether.items.ItemsAether;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;

diff --git a/src/main/java/shnupbups/tinkersaether/traits/Festive.java b/src/main/java/shnupbups/tinkersaether/traits/Festive.java
@@ -1,6 +1,6 @@
 package shnupbups.tinkersaether.traits;
 
-import com.legacy.aether.mc1122.items.ItemsAether;
+import com.legacy.aether.items.ItemsAether;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;

diff --git a/src/main/java/shnupbups/tinkersaether/traits/Gilded.java b/src/main/java/shnupbups/tinkersaether/traits/Gilded.java
@@ -1,8 +1,8 @@
 package shnupbups.tinkersaether.traits;
 
-import com.legacy.aether.mc1122.blocks.BlocksAether;
-import com.legacy.aether.mc1122.blocks.util.EnumLogType;
-import com.legacy.aether.mc1122.items.ItemsAether;
+import com.legacy.aether.blocks.BlocksAether;
+import com.legacy.aether.blocks.util.EnumLogType;
+import com.legacy.aether.items.ItemsAether;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;

diff --git a/src/main/java/shnupbups/tinkersaether/traits/Rooted.java b/src/main/java/shnupbups/tinkersaether/traits/Rooted.java
@@ -1,6 +1,6 @@
 package shnupbups.tinkersaether.traits;
 
-import com.legacy.aether.universal.AetherUtil;
+import com.legacy.aether.Aether;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
@@ -25,8 +25,8 @@ public void afterBlockBreak(ItemStack tool, World world, IBlockState state, Bloc
         if(entity instanceof EntityPlayer) {
             EntityPlayer player = (EntityPlayer)entity;
             if(tool.getDestroySpeed(world.getBlockState(pos)) > 1.0f || ForgeHooks.isToolEffective(world, pos, tool)) {
-                if(state.getProperties().containsKey(PropertyBool.create(AetherUtil.doubleDropName()))) {
-                    boolean dropDouble = state.getValue(PropertyBool.create(AetherUtil.doubleDropName())).equals(true);
+                if(state.getProperties().containsKey(PropertyBool.create(Aether.doubleDropNotifier()))) {
+                    boolean dropDouble = state.getValue(PropertyBool.create(Aether.doubleDropNotifier())).equals(true);
                     if(dropDouble && !world.isRemote) {
                         NonNullList<ItemStack> drops = NonNullList.create();
                         state.getBlock().getDrops(drops, world, pos, state, 0);

diff --git a/src/main/java/shnupbups/tinkersaether/traits/Swetty.java b/src/main/java/shnupbups/tinkersaether/traits/Swetty.java
@@ -1,6 +1,6 @@
 package shnupbups.tinkersaether.traits;
 
-import com.legacy.aether.mc1122.entities.passive.mountable.EntitySwet;
+import com.legacy.aether.entities.passive.mountable.EntitySwet;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
   "modid": "tinkersaether",
   "name": "Tinker's Aether",
   "description": "Adds Aether materials and stuff to Tinker's Construct.",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "mcversion": "${mcversion}",
   "url": "",
   "updateUrl": "",