diff --git a/build.gradle b/build.gradle index 2152a6f..679e48d 100644 --- a/build.gradle +++ b/build.gradle @@ -7,20 +7,20 @@ buildscript { classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } + 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.3.0" +version = "1.4.0" group = "shnupbups.tinkersaether" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "tinkersaether" repositories { maven { - url 'http://dvs1.progwml6.com/files/maven' + url = "https://dvs1.progwml6.com/files/maven" } maven { - url = "http://maven.covers1624.net" + url = "https://maven.covers1624.net" } } @@ -30,9 +30,9 @@ compileJava { } minecraft { - version = "1.12.2-14.23.5.2768" + version = "1.12.2-14.23.5.2847" runDir = "run" - + // the mappings can be changed at any time, and must be in the following format. // snapshot_YYYYMMDD snapshot are built nightly. // stable_# stables are built at the discretion of the MCP team. @@ -44,8 +44,7 @@ minecraft { dependencies { deobfCompile "slimeknights.mantle:Mantle:1.12-+" - deobfCompile "slimeknights:TConstruct:1.12.2-2.12.0.+" - + deobfCompile "slimeknights:TConstruct:1.12.2-2.13.0.188" } processResources { @@ -56,11 +55,11 @@ processResources { // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' - + // replace version and mcversion expand 'version':project.version, 'mcversion':project.minecraft.version } - + // copy everything else except the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 30d399d..e708b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18cba7..290541c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Mon Sep 14 12:28:28 PDT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip diff --git a/gradlew b/gradlew index 91a7e26..4f906e0 100644 --- a/gradlew +++ b/gradlew @@ -1,4 +1,20 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## ## @@ -6,20 +22,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +64,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,33 +75,14 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -90,7 +106,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -110,11 +126,13 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` SEP="" @@ -138,27 +156,30 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -8,20 +24,23 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,34 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/libs/aether_legacy-1.12.2-v1.4.4.jar b/libs/aether-1.12.2-v1.5.0.jar similarity index 90% rename from libs/aether_legacy-1.12.2-v1.4.4.jar rename to libs/aether-1.12.2-v1.5.0.jar index a7beae2..087bcff 100644 Binary files a/libs/aether_legacy-1.12.2-v1.4.4.jar and b/libs/aether-1.12.2-v1.5.0.jar differ diff --git a/src/main/java/shnupbups/tinkersaether/TinkersAether.java b/src/main/java/shnupbups/tinkersaether/TinkersAether.java index 44aa935..cb0a678 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@[1.4.4,);") +@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.5.0,);") public class TinkersAether { public static final String modid = "tinkersaether"; public static final String name = "Tinkers Aether"; - public static final String version = "1.3.0"; + public static final String version = "1.4.0"; @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..7c9b1c6 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.gildedgames.the_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 index c8d9b0b..22f4701 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.gildedgames.the_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 index 1f5e86e..bed61dc 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.gildedgames.the_aether.blocks.BlocksAether; +import com.gildedgames.the_aether.items.ItemsAether; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java b/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java index c60d4dc..1319636 100644 --- a/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java +++ b/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java @@ -1,7 +1,7 @@ package shnupbups.tinkersaether.modules; -import com.legacy.aether.api.enchantments.AetherEnchantment; -import com.legacy.aether.items.ItemsAether; +import com.gildedgames.the_aether.api.enchantments.AetherEnchantment; +import com.gildedgames.the_aether.items.ItemsAether; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/shnupbups/tinkersaether/tools/ToolDartShooter.java b/src/main/java/shnupbups/tinkersaether/tools/ToolDartShooter.java index 5d09946..366e8bc 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.gildedgames.the_aether.entities.projectile.darts.EntityDartEnchanted; +import com.gildedgames.the_aether.entities.projectile.darts.EntityDartGolden; +import com.gildedgames.the_aether.entities.projectile.darts.EntityDartPoison; +import com.gildedgames.the_aether.items.ItemsAether; 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 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 8a23411..71a9024 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.gildedgames.the_aether.entities.block.EntityFloatingBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -36,7 +36,7 @@ public void floatBlock(PlayerInteractEvent.RightClickBlock event) { } if (!world.isRemote) { - EntityFloatingBlock ent = new EntityFloatingBlock(world, pos, world.getBlockState(pos)); + EntityFloatingBlock ent = new EntityFloatingBlock(world, pos.getX(), pos.getY(), pos.getZ(), world.getBlockState(pos)); world.spawnEntity(ent); world.setBlockToAir(pos); } diff --git a/src/main/java/shnupbups/tinkersaether/traits/Enlightened.java b/src/main/java/shnupbups/tinkersaether/traits/Enlightened.java index 466cf92..6fcf71f 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.gildedgames.the_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 index 0baedd0..3f4c0a7 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.gildedgames.the_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 index 02b5214..dd2f00e 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.gildedgames.the_aether.blocks.BlocksAether; +import com.gildedgames.the_aether.blocks.util.EnumLogType; +import com.gildedgames.the_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/Refrigeration.java b/src/main/java/shnupbups/tinkersaether/traits/Refrigeration.java index f784b6e..1f1cf81 100644 --- a/src/main/java/shnupbups/tinkersaether/traits/Refrigeration.java +++ b/src/main/java/shnupbups/tinkersaether/traits/Refrigeration.java @@ -1,6 +1,6 @@ package shnupbups.tinkersaether.traits; -import com.legacy.aether.api.AetherAPI; +import com.gildedgames.the_aether.api.AetherAPI; import net.minecraft.item.ItemStack; import net.minecraftforge.event.world.BlockEvent; diff --git a/src/main/java/shnupbups/tinkersaether/traits/Skyrooted.java b/src/main/java/shnupbups/tinkersaether/traits/Skyrooted.java index 881f0c8..b5ab9f3 100644 --- a/src/main/java/shnupbups/tinkersaether/traits/Skyrooted.java +++ b/src/main/java/shnupbups/tinkersaether/traits/Skyrooted.java @@ -1,6 +1,6 @@ package shnupbups.tinkersaether.traits; -import com.legacy.aether.Aether; +import com.gildedgames.the_aether.Aether; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/shnupbups/tinkersaether/traits/Swetty.java b/src/main/java/shnupbups/tinkersaether/traits/Swetty.java index a3091ad..ffd2c23 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.gildedgames.the_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 index 5fb965f..431f01a 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,10 +2,10 @@ { "modid": "tinkersaether", "name": "Tinker's Aether", - "description": "Adds Aether materials and stuff to Tinker's Construct.", - "version": "1.3.0", + "description": "Adds Aether materials and stuff to Tinkers' Construct.", + "version": "1.4.0", "mcversion": "${mcversion}", - "url": "https://minecraft.curseforge.com/projects/tinkers-aether", + "url": "https://www.curseforge.com/minecraft/mc-mods/tinkers-aether", "updateUrl": "", "authorList": ["Shnupbups"], "credits": "",