Browse Source

First commit of Aether Legacy XP!

- Backported Aether II's new aercloud types (green, purple, storm). All but the storm variant will naturally generate at the moment.
- Updated Gradle because IntelliJ didn't like the current version in the repo
tags/1.12.2-1.5.0
TheGag96 1 year ago
parent
commit
d44941357a
30 changed files with 708 additions and 395 deletions
  1. +1
    -1
      build.gradle
  2. BIN
      gradle/wrapper/gradle-wrapper.jar
  3. +1
    -2
      gradle/wrapper/gradle-wrapper.properties
  4. +43
    -35
      gradlew
  5. +84
    -90
      gradlew.bat
  6. +122
    -11
      src/main/java/com/legacy/aether/blocks/natural/BlockAercloud.java
  7. +2
    -2
      src/main/java/com/legacy/aether/blocks/util/EnumCloudType.java
  8. +31
    -9
      src/main/java/com/legacy/aether/client/renders/blocks/BlockRendering.java
  9. +4
    -0
      src/main/java/com/legacy/aether/registry/sounds/SoundsAether.java
  10. +2
    -0
      src/main/java/com/legacy/aether/world/biome/AetherBiomeDecorator.java
  11. +10
    -1
      src/main/java/com/legacy/aether/world/biome/decoration/AetherGenClouds.java
  12. +27
    -0
      src/main/resources/assets/aether_legacy/blockstates/aercloud.json
  13. +4
    -0
      src/main/resources/assets/aether_legacy/lang/en_US.lang
  14. +30
    -0
      src/main/resources/assets/aether_legacy/models/block/green_aercloud.json
  15. +36
    -0
      src/main/resources/assets/aether_legacy/models/block/purple_aercloud.json
  16. +30
    -0
      src/main/resources/assets/aether_legacy/models/block/storm_aercloud.json
  17. +10
    -0
      src/main/resources/assets/aether_legacy/models/item/green_aercloud.json
  18. +10
    -0
      src/main/resources/assets/aether_legacy/models/item/purple_aercloud.json
  19. +10
    -0
      src/main/resources/assets/aether_legacy/models/item/storm_aercloud.json
  20. +246
    -239
      src/main/resources/assets/aether_legacy/sounds.json
  21. BIN
      src/main/resources/assets/aether_legacy/sounds/block/aercloud/bounce.ogg
  22. BIN
      src/main/resources/assets/aether_legacy/textures/blocks/green_aercloud.png
  23. BIN
      src/main/resources/assets/aether_legacy/textures/blocks/purple_aercloud_back.png
  24. BIN
      src/main/resources/assets/aether_legacy/textures/blocks/purple_aercloud_down.png
  25. BIN
      src/main/resources/assets/aether_legacy/textures/blocks/purple_aercloud_front.png
  26. BIN
      src/main/resources/assets/aether_legacy/textures/blocks/purple_aercloud_left.png
  27. BIN
      src/main/resources/assets/aether_legacy/textures/blocks/purple_aercloud_right.png
  28. BIN
      src/main/resources/assets/aether_legacy/textures/blocks/purple_aercloud_up.png
  29. BIN
      src/main/resources/assets/aether_legacy/textures/blocks/storm_aercloud.png
  30. +5
    -5
      src/main/resources/mcmod.info

+ 1
- 1
build.gradle View File

@@ -9,7 +9,7 @@ buildscript {
}
apply plugin: 'net.minecraftforge.gradle.forge'

version = "1.12.2-v1.4.4"
version = "1.12.2-v1.4.5"
group = "com.legacy.aether"
archivesBaseName = "aether_legacy"



BIN
gradle/wrapper/gradle-wrapper.jar View File


+ 1
- 2
gradle/wrapper/gradle-wrapper.properties View File

@@ -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.8.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

+ 43
- 35
gradlew View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh

##############################################################################
##
@@ -6,20 +6,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=""

# 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 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,31 +59,11 @@ 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.
@@ -90,7 +89,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
@@ -114,6 +113,7 @@ fi
if $cygwin ; 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`
@@ -154,11 +154,19 @@ if $cygwin ; then
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"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
exec "$JAVACMD" "$@"

+ 84
- 90
gradlew.bat View File

@@ -1,90 +1,84 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@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 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

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
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%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@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=
@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
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_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=%*
: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%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

+ 122
- 11
src/main/java/com/legacy/aether/blocks/natural/BlockAercloud.java View File

@@ -5,6 +5,7 @@ import com.legacy.aether.blocks.util.EnumCloudType;
import com.legacy.aether.blocks.util.IAetherMeta;
import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs;

import com.legacy.aether.registry.sounds.SoundsAether;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
@@ -15,12 +16,10 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.NonNullList;
import net.minecraft.util.*;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
@@ -28,10 +27,13 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

import java.util.Random;

public class BlockAercloud extends Block implements IAetherMeta
{

public static final PropertyEnum<EnumCloudType> cloud_type = PropertyEnum.create("aether_aercloud", EnumCloudType.class);
public static final PropertyEnum<EnumFacing> property_facing = PropertyEnum.create("facing", EnumFacing.class);

public BlockAercloud()
{
@@ -40,7 +42,7 @@ public class BlockAercloud extends Block implements IAetherMeta
this.setHardness(0.2F);
this.setSoundType(SoundType.CLOTH);
this.setCreativeTab(AetherCreativeTabs.blocks);
this.setDefaultState(this.blockState.getBaseState().withProperty(cloud_type, EnumCloudType.Cold));
this.setDefaultState(this.blockState.getBaseState().withProperty(cloud_type, EnumCloudType.Cold).withProperty(property_facing, EnumFacing.NORTH));
}

public static int getHexColor(ItemStack stack)
@@ -57,7 +59,6 @@ public class BlockAercloud extends Block implements IAetherMeta
return 0xCCFFFF;
}
}
else if (stack.getMetadata() == 2)
{
if (AetherConfig.visual_options.updated_aercloud_colors)
@@ -70,6 +71,39 @@ public class BlockAercloud extends Block implements IAetherMeta
return 0xFFFF80;
}
}
else if (stack.getMetadata() == 4) //Green
{
if (AetherConfig.visual_options.updated_aercloud_colors)
{
return 0xb0ea6b;
}
else
{
return 0xcfff94;
}
}
else if (stack.getMetadata() == 5) //Storm
{
if (AetherConfig.visual_options.updated_aercloud_colors)
{
return 0x576d90;
}
else
{
return 0x8497b6;
}
}
else if (stack.getMetadata() >= 6) //Purple
{
if (AetherConfig.visual_options.updated_aercloud_colors)
{
return 0xb77ff3;
}
else
{
return 0xe0c3ff;
}
}

return 16777215; //Default color
}
@@ -79,7 +113,7 @@ public class BlockAercloud extends Block implements IAetherMeta
{
entity.fallDistance = 0;

if (((EnumCloudType)state.getValue(cloud_type)).equals(EnumCloudType.Blue))
if (state.getValue(cloud_type).equals(EnumCloudType.Blue))
{
if (entity instanceof EntityPlayer)
{
@@ -106,19 +140,48 @@ public class BlockAercloud extends Block implements IAetherMeta

if (world.isRemote)
{
if (!(entity instanceof EntityItem))
{
world.playSound(pos.getX(), pos.getY(), pos.getZ(), SoundsAether.aercloud_bounce, SoundCategory.BLOCKS, 0.8f,
0.9f + (world.rand.nextFloat() * 0.2f), false);
}

for (int count = 0; count < 50; count++)
{
double xOffset = pos.getX() + world.rand.nextDouble();
double yOffset = pos.getY() + world.rand.nextDouble();
double yOffset = pos.getY() + 1.0D;
double zOffset = pos.getZ() + world.rand.nextDouble();

world.spawnParticle(EnumParticleTypes.WATER_SPLASH, xOffset, yOffset, zOffset, 0, 0, 0);
}
}
}
else if (state.getValue(cloud_type).equals(EnumCloudType.Green) || state.getValue(cloud_type).equals(EnumCloudType.Purple))
{
final EnumFacing facing = state.getValue(cloud_type).equals(EnumCloudType.Green) ? EnumFacing.random(world.rand) : state.getValue(property_facing);

entity.motionX = facing.getXOffset() * 2.5D;
entity.motionZ = facing.getZOffset() * 2.5D;

if (world.isRemote && !(entity instanceof EntityItem))
{
world.playSound(pos.getX(), pos.getY(), pos.getZ(), SoundsAether.aercloud_bounce, SoundCategory.BLOCKS, 0.8f,
0.9f + (world.rand.nextFloat() * 0.2f), false);
}
}
else if (state.getValue(cloud_type).equals(EnumCloudType.Golden))
{
entity.motionY = -1.2D;

if (world.isRemote && !(entity instanceof EntityItem))
{
world.playSound(pos.getX(), pos.getY(), pos.getZ(), SoundsAether.aercloud_bounce, SoundCategory.BLOCKS, 0.8f,
0.9f + (world.rand.nextFloat() * 0.2f), false);
}
}
else
{
if (((EnumCloudType)state.getValue(cloud_type)).equals(EnumCloudType.Pink))
if (state.getValue(cloud_type).equals(EnumCloudType.Pink))
{
if (entity.ticksExisted % 20 == 0 && entity instanceof EntityLivingBase)
{
@@ -166,19 +229,31 @@ public class BlockAercloud extends Block implements IAetherMeta
@Override
public IBlockState getStateFromMeta(int meta)
{
if (meta >= EnumCloudType.Purple.getMeta()) //Purple
{
return this.getDefaultState().withProperty(cloud_type, EnumCloudType.Purple)
.withProperty(property_facing, EnumFacing.byHorizontalIndex(meta - EnumCloudType.Purple.getMeta()));
}


return this.getDefaultState().withProperty(cloud_type, EnumCloudType.getType(meta));
}

@Override
public int getMetaFromState(IBlockState state)
{
if (state.getValue(cloud_type) == EnumCloudType.Purple)
{
return EnumCloudType.Purple.getMeta() + state.getValue(property_facing).getHorizontalIndex();
}

return ((EnumCloudType)state.getValue(cloud_type)).getMeta();
}

@Override
protected BlockStateContainer createBlockState()
{
return new BlockStateContainer(this, new IProperty[] {cloud_type});
return new BlockStateContainer(this, new IProperty[] {cloud_type, property_facing});
}

@Override
@@ -223,7 +298,43 @@ public class BlockAercloud extends Block implements IAetherMeta
@Override
public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos)
{
return ((EnumCloudType)blockState.getValue(cloud_type)).getMeta() != 1 ? new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.01D, 1.0D) : new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
if (blockState.getValue(cloud_type) == EnumCloudType.Blue ||
blockState.getValue(cloud_type) == EnumCloudType.Golden ||
blockState.getValue(cloud_type) == EnumCloudType.Green ||
blockState.getValue(cloud_type) == EnumCloudType.Purple)
{
return new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
}
else
{
return new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.01D, 1.0D);
}
}

@Override
public IBlockState getStateForPlacement(final World world, final BlockPos pos, final EnumFacing facing, final float hitX, final float hitY,
final float hitZ, final int meta,
final EntityLivingBase placer)
{
return this.getStateFromMeta(meta).withProperty(property_facing, placer.getHorizontalFacing().getOpposite());
}

@Override
@SideOnly(Side.CLIENT)
public void randomDisplayTick(final IBlockState state, final World world, final BlockPos pos, final Random rand)
{
if (state.getValue(cloud_type) == EnumCloudType.Purple)
{
final float x = pos.getX() + (rand.nextFloat() * 0.7f) + 0.15f;
final float y = pos.getY() + (rand.nextFloat() * 0.7f) + 0.15f;
final float z = pos.getZ() + (rand.nextFloat() * 0.7f) + 0.15f;

final EnumFacing facing = state.getValue(property_facing);

final float motionX = facing.getXOffset() * ((rand.nextFloat() * 0.01f) + 0.05f);
final float motionZ = facing.getZOffset() * ((rand.nextFloat() * 0.01f) + 0.05f);

world.spawnParticle(EnumParticleTypes.CLOUD, x, y, z, motionX, 0, motionZ);
}
}
}

+ 2
- 2
src/main/java/com/legacy/aether/blocks/util/EnumCloudType.java View File

@@ -5,7 +5,7 @@ import net.minecraft.util.IStringSerializable;
public enum EnumCloudType implements IStringSerializable
{

Cold(0, "cold_aercloud"), Blue(1, "blue_aercloud"), Golden(2, "golden_aercloud"), Pink(3, "pink_aercloud");
Cold(0, "cold_aercloud"), Blue(1, "blue_aercloud"), Golden(2, "golden_aercloud"), Pink(3, "pink_aercloud"), Green(4, "green_aercloud"), Storm(5, "storm_aercloud"), Purple(6, "purple_aercloud");

private int meta;

@@ -21,7 +21,7 @@ public enum EnumCloudType implements IStringSerializable

public static EnumCloudType getType(int meta)
{
return meta == 1 ? Blue : meta == 2 ? Golden : meta == 3 ? Pink : Cold;
return meta == 1 ? Blue : meta == 2 ? Golden : meta == 3 ? Pink : meta == 4 ? Green : meta == 5 ? Storm : meta >= 6 ? Purple : Cold;
}

public int getMeta()


+ 31
- 9
src/main/java/com/legacy/aether/client/renders/blocks/BlockRendering.java View File

@@ -1,6 +1,10 @@
package com.legacy.aether.client.renders.blocks;

import com.google.common.collect.Maps;
//import com.legacy.aether.AetherLogger;
import com.legacy.aether.blocks.natural.*;
import net.minecraft.block.Block;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemMeshDefinition;
@@ -17,20 +21,14 @@ import com.legacy.aether.Aether;
import com.legacy.aether.blocks.BlocksAether;
import com.legacy.aether.blocks.container.BlockAetherContainer;
import com.legacy.aether.blocks.decorative.BlockAetherFenceGate;
import com.legacy.aether.blocks.natural.BlockAetherDirt;
import com.legacy.aether.blocks.natural.BlockAetherGrass;
import com.legacy.aether.blocks.natural.BlockAetherLeaves;
import com.legacy.aether.blocks.natural.BlockAetherLog;
import com.legacy.aether.blocks.natural.BlockCrystalLeaves;
import com.legacy.aether.blocks.natural.BlockHolidayLeaves;
import com.legacy.aether.blocks.natural.BlockHolystone;
import com.legacy.aether.blocks.natural.BlockQuicksoil;
import com.legacy.aether.blocks.natural.ore.BlockAmbrosiumOre;
import com.legacy.aether.blocks.util.EnumCloudType;
import com.legacy.aether.blocks.util.EnumStoneType;
import com.legacy.aether.client.renders.AetherEntityRenderingRegistry;
import com.legacy.aether.client.renders.items.util.AetherColor;

import java.util.LinkedHashMap;

public class BlockRendering
{

@@ -52,6 +50,30 @@ public class BlockRendering
registerBlockWithStateMapper(BlocksAether.incubator, (new AetherStateMap.Builder()).ignore(BlockAetherContainer.powered).build());
registerBlockWithStateMapper(BlocksAether.freezer, (new AetherStateMap.Builder()).ignore(BlockAetherContainer.powered).build());

ModelLoader.setCustomStateMapper(BlocksAether.aercloud, new StateMapperBase()
{
@Override
protected ModelResourceLocation getModelResourceLocation(final IBlockState state)
{
final LinkedHashMap<IProperty<?>, Comparable<?>> mappings = Maps.newLinkedHashMap(state.getProperties());

if (state.getValue(BlockAercloud.cloud_type) != EnumCloudType.Purple)
{
mappings.remove(BlockAercloud.property_facing);
}

// AetherLogger.print("Hello friends: " + mappings.toString());

final ResourceLocation resource = Block.REGISTRY.getNameForObject(state.getBlock());


// return new ModelResourceLocation(state.getBlock().getRegistryName(), this.getPropertyString(mappings));
return new ModelResourceLocation(resource, this.getPropertyString(mappings));
}
});



register(BlocksAether.enchanted_aether_grass, "enchanted_aether_grass");
register(BlocksAether.holystone_brick, "holystone_brick");
register(BlocksAether.icestone, "icestone");
@@ -135,7 +157,7 @@ public class BlockRendering
register(BlocksAether.dungeon_trap, meta, name);
}

registerMetadata(BlocksAether.aercloud, Aether.locate("cold_aercloud"), Aether.locate("blue_aercloud"), Aether.locate("golden_aercloud"), Aether.locate("pink_aercloud"));
registerMetadata(BlocksAether.aercloud, Aether.locate("cold_aercloud"), Aether.locate("blue_aercloud"), Aether.locate("golden_aercloud"), Aether.locate("pink_aercloud"), Aether.locate("green_aercloud"), Aether.locate("storm_aercloud"), Aether.locate("purple_aercloud"));
registerMetadata(BlocksAether.aether_leaves, Aether.locate("green_leaves"), Aether.locate("golden_oak_leaves"));
registerMetadata(BlocksAether.holiday_leaves, Aether.locate("holiday_leaves"), Aether.locate("decorated_holiday_leaves"));
registerMetadata(BlocksAether.crystal_leaves, Aether.locate("crystal_leaves"), Aether.locate("crystal_fruit_leaves"));


+ 4
- 0
src/main/java/com/legacy/aether/registry/sounds/SoundsAether.java View File

@@ -33,6 +33,8 @@ public class SoundsAether

public static SoundEvent projectile_shoot, dart_shooter_shoot, aether_portal_idle, dungeon_trap;

public static SoundEvent aercloud_bounce;

public static SoundEvent aether1, aether2, aether3, aether4, aether_menu;

public static IForgeRegistry<SoundEvent> soundRegistry;
@@ -82,6 +84,8 @@ public class SoundsAether
aether_portal_idle = register(Aether.locate("aemisc.aether_portal.idle"));
dungeon_trap = register(Aether.locate("aemisc.dungeon_trap.trigger"));

aercloud_bounce = register(Aether.locate("block.aercloud.bounce"));

achievement_gen = register(Aether.locate("achievement"));
achievement_bronze = register(Aether.locate("achievement_bronze"));
achievement_silver = register(Aether.locate("achievement_silver"));


+ 2
- 0
src/main/java/com/legacy/aether/world/biome/AetherBiomeDecorator.java View File

@@ -142,6 +142,8 @@ public class AetherBiomeDecorator extends BiomeDecorator
this.generateClouds(EnumCloudType.Golden, 4, 50, this.nextInt(64) + 96);
this.generateClouds(EnumCloudType.Blue, 8, 26, this.nextInt(64) + 32);
this.generateClouds(EnumCloudType.Cold, 16, 14, this.nextInt(64) + 64);
this.generateClouds(EnumCloudType.Green, 4, 70, this.nextInt(64) + 32);
this.generateClouds(EnumCloudType.Purple, 4, 70, this.nextInt(64) + 32);
}

if (TerrainGen.decorate(worldIn, random, pos, EventType.FLOWERS))


+ 10
- 1
src/main/java/com/legacy/aether/world/biome/decoration/AetherGenClouds.java View File

@@ -2,6 +2,8 @@ package com.legacy.aether.world.biome.decoration;

import java.util.Random;

import net.minecraft.block.state.IBlockState;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
@@ -38,6 +40,13 @@ public class AetherGenClouds extends WorldGenerator
BlockPos origin = new BlockPos(pos.getX() - 14, pos.getY(), pos.getZ() - 14);
BlockPos position = new BlockPos(origin);

IBlockState state = BlocksAether.aercloud.getDefaultState().withProperty(BlockAercloud.cloud_type, this.cloudType);

if (this.cloudType == EnumCloudType.Purple)
{
state = state.withProperty(BlockAercloud.property_facing, EnumFacing.HORIZONTALS[random.nextInt(EnumFacing.HORIZONTALS.length)]);
}

for (int amount = 0; amount < this.amount; ++amount)
{
int xOffset = random.nextInt(2);
@@ -58,7 +67,7 @@ public class AetherGenClouds extends WorldGenerator
{
if (Math.abs(x - position.getX()) + Math.abs(y - position.getY()) + Math.abs(z - position.getZ()) < 4 + random.nextInt(2))
{
this.setBlockAndNotifyAdequately(world, newPosition, BlocksAether.aercloud.getDefaultState().withProperty(BlockAercloud.cloud_type, this.cloudType));
this.setBlockAndNotifyAdequately(world, newPosition, state);
}
}
}


+ 27
- 0
src/main/resources/assets/aether_legacy/blockstates/aercloud.json View File

@@ -11,6 +11,33 @@
},
"aether_aercloud=pink_aercloud": {
"model": "aether_legacy:pink_aercloud"
},
"aether_aercloud=green_aercloud": {
"model": "aether_legacy:green_aercloud"
},
"aether_aercloud=storm_aercloud": {
"model": "aether_legacy:storm_aercloud"
},
"aether_aercloud=purple_aercloud,facing=north": {
"model": "aether_legacy:purple_aercloud"
},
"aether_aercloud=purple_aercloud,facing=south": {
"model": "aether_legacy:purple_aercloud",
"y": 180
},
"aether_aercloud=purple_aercloud,facing=west": {
"model": "aether_legacy:purple_aercloud",
"y": 270
},
"aether_aercloud=purple_aercloud,facing=east": {
"model": "aether_legacy:purple_aercloud",
"y": 90
},
"aether_aercloud=purple_aercloud,facing=up": {
"model": "aether_legacy:purple_aercloud"
},
"aether_aercloud=purple_aercloud,facing=down": {
"model": "aether_legacy:purple_aercloud"
}
}
}

+ 4
- 0
src/main/resources/assets/aether_legacy/lang/en_US.lang View File

@@ -139,6 +139,9 @@ tile.cold_aercloud.name=Cold Aercloud
tile.blue_aercloud.name=Blue Aercloud
tile.golden_aercloud.name=Golden Aercloud
tile.pink_aercloud.name=Pink Aercloud
tile.green_aercloud.name=Green Aercloud
tile.purple_aercloud.name=Purple Aercloud
tile.storm_aercloud.name=Storm Aercloud
tile.berry_bush_stem.name=Berry Bush Stem
tile.berry_bush.name=Berry Bush
tile.purple_flower.name=Purple Flower
@@ -321,6 +324,7 @@ subtitles.aeboss.slider.death=Slider breaks
subtitles.aeboss.sun_spirit.shoot=Sun Spirit shoots
subtitles.aemisc.portal.idle=Aether Portal wooshes
subtitles.aemisc.dungeon_trap.trigger=Dungeon Trap activated
subtitles.block.aercloud.bounce=Aercloud recoils

# GUI and Dialog
gui.item.life_shard.maxshards=You can only use a total of 10 life shards.


+ 30
- 0
src/main/resources/assets/aether_legacy/models/block/green_aercloud.json View File

@@ -0,0 +1,30 @@
{
"parent": "block/cube_all",
"textures": {
"all": "aether_legacy:blocks/green_aercloud"
},
"elements": [

{
"from": [ 0, 0, 0 ],

"to": [ 16, 16, 16 ],

"faces": {

"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down", "tintindex": 0 },

"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "up", "tintindex": 0 },

"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "north", "tintindex": 0 },

"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "south", "tintindex": 0 },

"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "west", "tintindex": 0 },

"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "east", "tintindex": 0 }

}

}]
}

+ 36
- 0
src/main/resources/assets/aether_legacy/models/block/purple_aercloud.json View File

@@ -0,0 +1,36 @@
{
"parent": "block/cube_all",
"textures": {
"down": "aether_legacy:blocks/purple_aercloud_down",
"up": "aether_legacy:blocks/purple_aercloud_up",
"north": "aether_legacy:blocks/purple_aercloud_front",
"east": "aether_legacy:blocks/purple_aercloud_right",
"south": "aether_legacy:blocks/purple_aercloud_back",
"west": "aether_legacy:blocks/purple_aercloud_left",
"particle": "aether_legacy:blocks/purple_aercloud_down"
},
"elements": [

{
"from": [ 0, 0, 0 ],

"to": [ 16, 16, 16 ],

"faces": {

"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#down", "cullface": "down", "tintindex": 0 },

"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#up", "cullface": "up", "tintindex": 0 },

"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#north", "cullface": "north", "tintindex": 0 },

"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#south", "cullface": "south", "tintindex": 0 },

"west": { "uv": [ 0, 0, 16, 16 ], "texture": "west", "cullface": "west", "tintindex": 0 },

"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#east", "cullface": "east", "tintindex": 0 }

}

}]
}

+ 30
- 0
src/main/resources/assets/aether_legacy/models/block/storm_aercloud.json View File

@@ -0,0 +1,30 @@
{
"parent": "block/cube_all",
"textures": {
"all": "aether_legacy:blocks/storm_aercloud"
},
"elements": [

{
"from": [ 0, 0, 0 ],

"to": [ 16, 16, 16 ],

"faces": {

"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down", "tintindex": 0 },

"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "up", "tintindex": 0 },

"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "north", "tintindex": 0 },

"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "south", "tintindex": 0 },

"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "west", "tintindex": 0 },

"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "east", "tintindex": 0 }

}

}]
}

+ 10
- 0
src/main/resources/assets/aether_legacy/models/item/green_aercloud.json View File

@@ -0,0 +1,10 @@
{
"parent": "aether_legacy:block/green_aercloud",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

+ 10
- 0
src/main/resources/assets/aether_legacy/models/item/purple_aercloud.json View File

@@ -0,0 +1,10 @@
{
"parent": "aether_legacy:block/purple_aercloud",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

+ 10
- 0
src/main/resources/assets/aether_legacy/models/item/storm_aercloud.json View File

@@ -0,0 +1,10 @@
{
"parent": "aether_legacy:block/storm_aercloud",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

+ 246
- 239
src/main/resources/assets/aether_legacy/sounds.json View File

@@ -1,317 +1,324 @@
{
"records.aether_tune": {
"category": "music",
"sounds":[
{
"name": "aether_legacy:record/aether_tune",
"stream": true
}
]
"category": "music",
"sounds": [
{
"name": "aether_legacy:record/aether_tune",
"stream": true
}
]
},
"records.ascending_dawn": {
"category": "music",
"sounds": [
{
"name": "aether_legacy:record/ascending_dawn",
"stream": true
}
]
"category": "music",
"sounds": [
{
"name": "aether_legacy:record/ascending_dawn",
"stream": true
}
]
},
"records.welcoming_skies": {
"category": "music",
"sounds": [
{
"name": "aether_legacy:record/welcoming_skies",
"stream": true
}
]
"category": "music",
"sounds": [
{
"name": "aether_legacy:record/welcoming_skies",
"stream": true
}
]
},
"records.legacy": {
"category": "music",
"sounds": [
{
"name": "aether_legacy:record/legacy",
"stream": true
}
]
"category": "music",
"sounds": [
{
"name": "aether_legacy:record/legacy",
"stream": true
}
]
},
"music.menu": {
"category": "music",
"sounds": [
{
"name": "aether_legacy:music/menu",
"stream": true
}
]
"category": "music",
"sounds": [
{
"name": "aether_legacy:music/menu",
"stream": true
}
]
},
"music.aether1": {
"category": "music",
"sounds": [
{
"name": "aether_legacy:music/aether1",
"stream": true
}
]
"category": "music",
"sounds": [
{
"name": "aether_legacy:music/aether1",
"stream": true
}
]
},
"music.aether2": {
"category": "music",
"sounds": [
{
"name": "aether_legacy:music/aether2",
"stream": true
}
]
"category": "music",
"sounds": [
{
"name": "aether_legacy:music/aether2",
"stream": true
}
]
},
"music.aether3": {
"category": "music",
"sounds": [
{
"name": "aether_legacy:music/aether3",
"stream": true
}
]
"category": "music",
"sounds": [
{
"name": "aether_legacy:music/aether3",
"stream": true
}
]
},
"music.aether4": {
"category": "music",
"sounds": [
{
"name": "aether_legacy:music/aether4",
"stream": true
}
]
"category": "music",
"sounds": [
{
"name": "aether_legacy:music/aether4",
"stream": true
}
]
},
"achievement": {
"category": "player",
"sounds": [
{
"name": "aether_legacy:achievement/achievement_gen",
"stream": true
}
]
"category": "player",
"sounds": [
{
"name": "aether_legacy:achievement/achievement_gen",
"stream": true
}
]
},
"achievement_silver": {
"category": "player",
"sounds": [
{
"name": "aether_legacy:achievement/achievement_silver",
"stream": true
}
]
"category": "player",
"sounds": [
{
"name": "aether_legacy:achievement/achievement_silver",
"stream": true
}
]
},
"achievement_bronze": {
"category": "player",
"sounds": [
{
"name": "aether_legacy:achievement/achievement_bronze",
"stream": true
}
]
"category": "player",
"sounds": [
{
"name": "aether_legacy:achievement/achievement_bronze",
"stream": true
}
]
},
"aemisc.aether_portal.idle": {
"category": "neutral",
"subtitle": "subtitles.aemisc.portal.idle",
"sounds": [
"portal/portal"
]
"category": "neutral",
"subtitle": "subtitles.aemisc.portal.idle",
"sounds": [
"portal/portal"
]
},
"aemisc.dungeon_trap.trigger": {
"category": "block",
"subtitle": "subtitles.aemisc.dungeon_trap.trigger",
"sounds": [
"block/fence_gate/open1",
"block/fence_gate/open2"
]
"category": "block",
"subtitle": "subtitles.aemisc.dungeon_trap.trigger",
"sounds": [
"block/fence_gate/open1",
"block/fence_gate/open2"
]
},
"aemob.moa.say": {
"category": "neutral",
"subtitle": "subtitles.aemob.moa.say",
"sounds": [
"aether_legacy:aemob/moa/say"
]
"category": "neutral",
"subtitle": "subtitles.aemob.moa.say",
"sounds": [
"aether_legacy:aemob/moa/say"
]
},
"aemob.moa.flap": {
"category": "neutral",
"subtitle": "subtitles.aemob.moa.flap",
"sounds": [
"mob/bat/takeoff"
]
"category": "neutral",
"subtitle": "subtitles.aemob.moa.flap",
"sounds": [
"mob/bat/takeoff"
]
},
"aemob.sheepuff.say": {
"category": "neutral",
"subtitle": "subtitles.aemob.sheepuff.say",
"sounds": [
"mob/sheep/say1",
"mob/sheep/say2",
"mob/sheep/say3"
]
"category": "neutral",
"subtitle": "subtitles.aemob.sheepuff.say",
"sounds": [
"mob/sheep/say1",
"mob/sheep/say2",
"mob/sheep/say3"
]
},
"aemob.sheepuff.hurt": {
"category": "neutral",
"subtitle": "subtitles.aemob.sheepuff.hurt",
"sounds": [
"mob/sheep/say1",
"mob/sheep/say2",
"mob/sheep/say3"
]
"category": "neutral",
"subtitle": "subtitles.aemob.sheepuff.hurt",
"sounds": [
"mob/sheep/say1",
"mob/sheep/say2",
"mob/sheep/say3"
]
},
"aemob.sheepuff.death": {
"category": "neutral",
"subtitle": "subtitles.aemob.sheepuff.death",
"sounds": [
"mob/sheep/say1",
"mob/sheep/say2",
"mob/sheep/say3"
]
"category": "neutral",
"subtitle": "subtitles.aemob.sheepuff.death",
"sounds": [
"mob/sheep/say1",
"mob/sheep/say2",
"mob/sheep/say3"
]
},
"aemob.flyingcow.say": {
"category": "neutral",
"subtitle": "subtitles.aemob.flyingcow.say",
"sounds": [
"mob/cow/say1",
"mob/cow/say2",
"mob/cow/say3",
"mob/cow/say4"
]
"category": "neutral",
"subtitle": "subtitles.aemob.flyingcow.say",
"sounds": [
"mob/cow/say1",
"mob/cow/say2",
"mob/cow/say3",
"mob/cow/say4"
]
},
"aemob.flyingcow.hurt": {
"category": "neutral",
"subtitle": "subtitles.aemob.flyingcow.hurt",
"sounds": [
"mob/cow/hurt1",
"mob/cow/hurt2",
"mob/cow/hurt3"
]
"category": "neutral",
"subtitle": "subtitles.aemob.flyingcow.hurt",
"sounds": [
"mob/cow/hurt1",
"mob/cow/hurt2",
"mob/cow/hurt3"
]
},
"aemob.flyingcow.death": {
"category": "neutral",
"subtitle": "subtitles.aemob.flyingcow.death",
"sounds": [
"mob/cow/hurt1",
"mob/cow/hurt2",
"mob/cow/hurt3"
]
"category": "neutral",
"subtitle": "subtitles.aemob.flyingcow.death",
"sounds": [
"mob/cow/hurt1",
"mob/cow/hurt2",
"mob/cow/hurt3"
]
},
"aemob.phyg.say": {
"category": "neutral",
"subtitle": "subtitles.aemob.phyg.say",
"sounds": [
"mob/pig/say1",
"mob/pig/say2",
"mob/pig/say3"
]
"category": "neutral",
"subtitle": "subtitles.aemob.phyg.say",
"sounds": [
"mob/pig/say1",
"mob/pig/say2",
"mob/pig/say3"
]
},
"aemob.phyg.hurt": {
"category": "neutral",
"subtitle": "subtitles.aemob.phyg.hurt",
"sounds": [
"mob/pig/say1",
"mob/pig/say2",
"mob/pig/say3"
]
"category": "neutral",
"subtitle": "subtitles.aemob.phyg.hurt",
"sounds": [
"mob/pig/say1",
"mob/pig/say2",
"mob/pig/say3"
]
},
"aemob.phyg.death": {
"category": "neutral",
"subtitle": "subtitles.aemob.phyg.death",
"sounds": [
"mob/pig/death"
]
"category": "neutral",
"subtitle": "subtitles.aemob.phyg.death",
"sounds": [
"mob/pig/death"
]
},
"aemob.aerbunny.hurt": {
"category": "neutral",
"subtitle": "subtitles.aemob.aerbunny.hurt",
"sounds": [
"aether_legacy:aemob/aerbunny/hurt"
]
"category": "neutral",
"subtitle": "subtitles.aemob.aerbunny.hurt",
"sounds": [
"aether_legacy:aemob/aerbunny/hurt"
]
},
"aemob.aerbunny.death": {
"category": "neutral",
"subtitle": "subtitles.aemob.aerbunny.death",
"sounds": [
"aether_legacy:aemob/aerbunny/death"
]
"category": "neutral",
"subtitle": "subtitles.aemob.aerbunny.death",
"sounds": [
"aether_legacy:aemob/aerbunny/death"
]
},
"aemob.aerbunny.lift": {
"category": "neutral",
"subtitle": "subtitles.aemob.aerbunny.lift",
"sounds": [
"aether_legacy:aemob/aerbunny/lift"
]
"category": "neutral",
"subtitle": "subtitles.aemob.aerbunny.lift",
"sounds": [
"aether_legacy:aemob/aerbunny/lift"
]
},
"aemob.zephyr.call": {
"category": "hostile",
"subtitle": "subtitles.aemob.zephyr.say",
"sounds": [
"aether_legacy:aemob/zephyr/call"
]
"category": "hostile",
"subtitle": "subtitles.aemob.zephyr.say",
"sounds": [
"aether_legacy:aemob/zephyr/call"
]
},
"aemob.zephyr.shoot": {
"category": "hostile",
"subtitle": "subtitles.aemob.zephyr.shoot",
"sounds": [
"aether_legacy:aemob/zephyr/shoot"
]
"category": "hostile",
"subtitle": "subtitles.aemob.zephyr.shoot",
"sounds": [
"aether_legacy:aemob/zephyr/shoot"
]
},
"aemob.aerwhale.call": {
"category": "neutral",
"subtitle": "subtitles.aemob.aerwhale.say",
"sounds": [
"aether_legacy:aemob/aerwhale/call"
]
"category": "neutral",
"subtitle": "subtitles.aemob.aerwhale.say",
"sounds": [
"aether_legacy:aemob/aerwhale/call"
]
},
"aemob.aerwhale.death": {
"category": "neutral",
"subtitle": "subtitles.aemob.aerwhale.death",
"sounds": [
"aether_legacy:aemob/aerwhale/death"
]
"category": "neutral",
"subtitle": "subtitles.aemob.aerwhale.death",
"sounds": [
"aether_legacy:aemob/aerwhale/death"
]
},
"projectile.shoot": {
"category": "player",
"subtitle": "subtitles.aemisc.projectile.shoot",
"sounds": [
"aether_legacy:projectile/shoot"
]
"category": "player",
"subtitle": "subtitles.aemisc.projectile.shoot",
"sounds": [
"aether_legacy:projectile/shoot"
]
},
"projectile.dart_shooter.shoot": {
"category": "player",
"subtitle": "subtitles.aemisc.dart_shooter.shoot",
"sounds": [
"aether_legacy:projectile/dart_shooter/shoot"
]
"category": "player",
"subtitle": "subtitles.aemisc.dart_shooter.shoot",
"sounds": [
"aether_legacy:projectile/dart_shooter/shoot"
]
},
"aeboss.slider.awaken": {
"category": "hostile",
"subtitle": "subtitles.aeboss.slider.awaken",
"sounds": [
"aether_legacy:aeboss/slider/awaken"
]
"category": "hostile",
"subtitle": "subtitles.aeboss.slider.awaken",
"sounds": [
"aether_legacy:aeboss/slider/awaken"
]
},
"aeboss.slider.collide": {
"category": "hostile",
"subtitle": "subtitles.aeboss.slider.collide",
"sounds": [
"aether_legacy:aeboss/slider/collide"
]
"category": "hostile",
"subtitle": "subtitles.aeboss.slider.collide",
"sounds": [
"aether_legacy:aeboss/slider/collide"
]
},
"aeboss.slider.move": {
"category": "hostile",
"subtitle": "subtitles.aeboss.slider.move",
"sounds": [
"aether_legacy:aeboss/slider/move"
]
"category": "hostile",
"subtitle": "subtitles.aeboss.slider.move",
"sounds": [
"aether_legacy:aeboss/slider/move"
]
},
"aeboss.slider.death": {
"category": "hostile",
"subtitle": "subtitles.aeboss.slider.death",
"sounds": [
"aether_legacy:aeboss/slider/death"
]
},
"category": "hostile",
"subtitle": "subtitles.aeboss.slider.death",
"sounds": [
"aether_legacy:aeboss/slider/death"
]
},
"aeboss.sun_spirit.shoot": {
"category": "hostile",
"subtitle": "subtitles.aeboss.sun_spirit.shoot",
"sounds": [
"mob/ghast/fireball4"
]
}
"category": "hostile",
"subtitle": "subtitles.aeboss.sun_spirit.shoot",
"sounds": [
"mob/ghast/fireball4"
]
},
"block.aercloud.bounce": {
"category": "neutral",
"subtitle": "subtitles.aether.block.aercloud.bounce",
"sounds": [
"aether_legacy:block/aercloud/bounce"
]
}
}

BIN
src/main/resources/assets/aether_legacy/sounds/block/aercloud/bounce.ogg View File


BIN
src/main/resources/assets/aether_legacy/textures/blocks/green_aercloud.png View File

Before After
Width: 16  |  Height: 16  |  Size: 232 B

BIN
src/main/resources/assets/aether_legacy/textures/blocks/purple_aercloud_back.png View File

Before After
Width: 16  |  Height: 16  |  Size: 274 B

BIN
src/main/resources/assets/aether_legacy/textures/blocks/purple_aercloud_down.png View File

Before After
Width: 16  |  Height: 16  |  Size: 288 B

BIN
src/main/resources/assets/aether_legacy/textures/blocks/purple_aercloud_front.png View File

Before After
Width: 16  |  Height: 16  |  Size: 289 B

BIN
src/main/resources/assets/aether_legacy/textures/blocks/purple_aercloud_left.png View File

Before After
Width: 16  |  Height: 16  |  Size: 317 B

BIN
src/main/resources/assets/aether_legacy/textures/blocks/purple_aercloud_right.png View File

Before After
Width: 16  |  Height: 16  |  Size: 290 B

BIN
src/main/resources/assets/aether_legacy/textures/blocks/purple_aercloud_up.png View File

Before After
Width: 16  |  Height: 16  |  Size: 303 B

BIN
src/main/resources/assets/aether_legacy/textures/blocks/storm_aercloud.png View File

Before After
Width: 16  |  Height: 16  |  Size: 194 B

+ 5
- 5
src/main/resources/mcmod.info View File

@@ -1,14 +1,14 @@
[
{
"modid": "aether_legacy",
"name": "Aether Legacy",
"description": "Aether Legacy, a port of Aether I which has been updated to the latest version of Minecraft. This version of the aether includes multiplayer support to play with friends and others alike.",
"version": "v1.4.4",
"name": "Aether Legacy XP",
"description": "Aether Legacy XP, a port of Aether I which has been updated to Minecraft 1.12.2, but with extra features backported from Aether II.",
"version": "v1.4.5",
"mcversion": "1.12.2",
"url": "https://www.moddinglegacy.com/",
"updateUrl": "",
"authorList": ["115kino, KingPhygieBoo, xJonL"],
"credits": "Gilded Games for allowing us permission to do this project, and InsomniaKitten for providing the inventory texture.",
"authorList": ["115kino, KingPhygieBoo, xJonL", "TheGag96"],
"credits": "Gilded Games for the amazing Aether mod series!",
"logoFile": "aether.png",
"screenshots": [""],
"dependencies": []


Loading…
Cancel
Save