diff --git a/build.gradle b/build.gradle index 6f94a77..db17d46 100644 --- 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.4" +version = "1.1.5" group = "shnupbups.tinkersaether" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "tinkersaether" diff --git a/libs/aether_legacy-1.12.2-v3.0.jar b/libs/aether_legacy-v3.1.jar similarity index 91% rename from libs/aether_legacy-1.12.2-v3.0.jar rename to libs/aether_legacy-v3.1.jar index 81b77f3..f114fec 100644 Binary files a/libs/aether_legacy-1.12.2-v3.0.jar and b/libs/aether_legacy-v3.1.jar differ diff --git a/src/main/java/shnupbups/tinkersaether/TinkersAether.java b/src/main/java/shnupbups/tinkersaether/TinkersAether.java index 13741d9..695efeb 100644 --- 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;") +@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,);") public class TinkersAether { public static final String modid = "tinkersaether"; public static final String name = "Tinkers Aether"; - public static final String version = "1.1.4"; + public static final String version = "1.1.5"; @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 index 98bf67d..0e66cd2 100644 --- 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.registry.creative_tabs.AetherCreativeTabs; +import com.legacy.aether.mc1122.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 index c8d9b0b..c25a79b 100644 --- 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.registry.creative_tabs.AetherCreativeTabs; +import com.legacy.aether.mc1122.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 index 4e09853..99233e0 100644 --- 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.blocks.BlocksAether; -import com.legacy.aether.items.ItemsAether; +import com.legacy.aether.mc1122.blocks.BlocksAether; +import com.legacy.aether.mc1122.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 index 5d09946..b6bda61 100644 --- 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.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 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 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 index f18bb3e..1292ac2 100644 --- 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.entities.block.EntityFloatingBlock; +import com.legacy.aether.mc1122.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 index de2b5f4..108ce0f 100644 --- 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.items.ItemsAether; +import com.legacy.aether.mc1122.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 index 42ee515..5026340 100644 --- 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.items.ItemsAether; +import com.legacy.aether.mc1122.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 index a548991..60904c4 100644 --- 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.blocks.BlocksAether; -import com.legacy.aether.blocks.util.EnumLogType; -import com.legacy.aether.items.ItemsAether; +import com.legacy.aether.mc1122.blocks.BlocksAether; +import com.legacy.aether.mc1122.blocks.util.EnumLogType; +import com.legacy.aether.mc1122.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 index 0ba48b7..55c8ebf 100644 --- 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.Aether; +import com.legacy.aether.universal.AetherUtil; 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(Aether.doubleDropNotifier()))) { - boolean dropDouble = state.getValue(PropertyBool.create(Aether.doubleDropNotifier())).equals(true); + if(state.getProperties().containsKey(PropertyBool.create(AetherUtil.doubleDropName()))) { + boolean dropDouble = state.getValue(PropertyBool.create(AetherUtil.doubleDropName())).equals(true); if(dropDouble && !world.isRemote) { NonNullList 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 index 96e2f87..1add9b7 100644 --- 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.entities.passive.mountable.EntitySwet; +import com.legacy.aether.mc1122.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 index 5b90b9a..cbff04f 100644 --- 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.4", + "version": "1.1.5", "mcversion": "${mcversion}", "url": "", "updateUrl": "",