mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-20 20:22:21 +00:00
commit
95275e57d6
227 files changed
+1350
-1222
No files matched your search
+17
@@ -0,0 +1,17 @@
|
||||
# IntelliJ IDEA Files
|
||||
*.iml
|
||||
*.ipr
|
||||
*.iws
|
||||
out/
|
||||
|
||||
# Eclipse Project Files
|
||||
.classpath
|
||||
.project
|
||||
.settings/
|
||||
eclipse/
|
||||
|
||||
# Gradle
|
||||
.gradle
|
||||
build/
|
||||
debug/
|
||||
libs/
|
||||
@@ -0,0 +1,23 @@
|
||||
====THAUMCRAFT API
|
||||
main.utils.compat.ThaumcraftHelper
|
||||
L201-233 addItemsToBackpack (not called at the moment anyway)
|
||||
L547 Aspect.SEED
|
||||
L554 Aspect.STONE
|
||||
L616 Aspect.ICE
|
||||
|
||||
main.utils.TickHandlerVersion
|
||||
Disabled.
|
||||
|
||||
main.utils.VersionInfo
|
||||
Disabled Logger modLogger, temporarily replaced with direct access to FMLLog (FML log switched to log4j).
|
||||
Creation of TickHandlerVersion instance disabled (have not reprogrammed to work with the new tick handler setup).
|
||||
|
||||
main.Config
|
||||
setupBlocks()
|
||||
Block registration & ItemBlock creation. (planksWood, slabWoodFull & slabWoodHalf) - ItemBlocks now registered with the block in GameRegistry.registerBlock, but I cannot seem to find calls to registerBlock for the above blocks.
|
||||
BuildCraft Facade IMC
|
||||
|
||||
world.feature.FeatureHive
|
||||
Replaced minHeight with rootHeight.
|
||||
Replaced maxHeight with heightVariation.
|
||||
I am not at all certain if these are accurate.
|
||||
@@ -0,0 +1,47 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven {
|
||||
name = "forge"
|
||||
url = "http://files.minecraftforge.net/maven"
|
||||
}
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'forge'
|
||||
|
||||
version = "2.1.13"
|
||||
group= "magicbees" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||
archivesBaseName = "magicbees"
|
||||
|
||||
minecraft {
|
||||
version = "1.7.2-10.12.0.1057"
|
||||
assetDir = "eclipse/assets"
|
||||
}
|
||||
|
||||
processResources
|
||||
{
|
||||
// this will ensure that this task is redone when the versions change.
|
||||
inputs.property "version", project.version
|
||||
inputs.property "mcversion", project.minecraft.version
|
||||
|
||||
// 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, thats not the mcmod.info
|
||||
from(sourceSets.main.resources.srcDirs) {
|
||||
exclude 'mcmod.info'
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,6 @@
|
||||
2.1.13
|
||||
Updated to 1.7.2.
|
||||
|
||||
2.1.12
|
||||
Changing hive gen to use isGenMineableReplaceable, which should make Deep hives spawn in Underground Biomes stone.
|
||||
Fixing logic error in handling world gen/retrogen
|
||||
Vendored
BIN
Binary file not shown.
+6
@@ -0,0 +1,6 @@
|
||||
#Wed Mar 26 13:33:58 CDT 2014
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
|
||||
@@ -0,0 +1,164 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn ( ) {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die ( ) {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=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
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
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
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=$((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" ;;
|
||||
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=("$@")
|
||||
}
|
||||
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
||||
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
||||
|
||||
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
||||
Vendored
+90
@@ -0,0 +1,90 @@
|
||||
@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
|
||||
@@ -1,143 +0,0 @@
|
||||
<project name="MagicBees" basedir="../../../" default="main">
|
||||
<property name="build.dir" value="build/MagicBees" />
|
||||
<property name="classes.dir" value="${build.dir}/classes" />
|
||||
<property name="resource.dir" value="${build.dir}/mc.dev" />
|
||||
<property name="jar.dir" value="build/jar" />
|
||||
|
||||
<property name="src.dir" value="Sources/MagicBees" />
|
||||
|
||||
<property name="forge.dir" value="${build.dir}/forge" />
|
||||
<property name="mcp.dir" value="${forge.dir}/mcp" />
|
||||
<property name="forestry.dir" value="Sources/Forestry/forestry_common/core" />
|
||||
<property name="thaumcraft.dir" value="Sources/Thaumcraft" />
|
||||
|
||||
<property name="clientsrc.dir" value="${mcp.dir}/src/minecraft" />
|
||||
|
||||
<property name="mc.version" value="1.6.2"/>
|
||||
<property name="forge.version" value="9.10.1.849"/>
|
||||
<property name="magicbees.version" value="2.1.12"/>
|
||||
|
||||
<!-- TARGETS -->
|
||||
<target name="clean">
|
||||
<delete dir="${clientsrc.dir}/forestry" />
|
||||
<delete dir="${clientsrc.dir}/thaumcraft" />
|
||||
<delete dir="${clientsrc.dir}/magicbees" />
|
||||
<delete dir="${classes.dir}" />
|
||||
</target>
|
||||
|
||||
<target name="forgeclean">
|
||||
<!-- Unzip forge -->
|
||||
<echo message="Unpacking Forge..." />
|
||||
<unzip dest="${build.dir}">
|
||||
<fileset dir="${resource.dir}">
|
||||
<include name="minecraftforge-src-${mc.version}-${forge.version}.zip"/>
|
||||
</fileset>
|
||||
</unzip>
|
||||
|
||||
<chmod file="${forge.dir}/install.sh" perm="+x"/>
|
||||
|
||||
<!-- Install forge -->
|
||||
<echo message="Installing Forge..." />
|
||||
<exec dir="${forge.dir}" executable="cmd" osfamily="windows">
|
||||
<arg line="/c install.cmd"/>
|
||||
</exec>
|
||||
|
||||
<exec dir="${forge.dir}" executable="sh" osfamily="unix">
|
||||
<arg value="install.sh" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
<target name="setup">
|
||||
<!-- Set build number -->
|
||||
<buildnumber file="${src.dir}/magicbees_res/build.number"/>
|
||||
|
||||
<!-- Copy source -->
|
||||
<echo message="Copying Source" />
|
||||
<copy todir="${clientsrc.dir}">
|
||||
<fileset dir="${forestry.dir}">
|
||||
<include name="forestry/api/**" />
|
||||
</fileset>
|
||||
<fileset dir="${thaumcraft.dir}/">
|
||||
<include name="thaumcraft/api/**" />
|
||||
</fileset>
|
||||
<fileset dir="${src.dir}/magicbees_src">
|
||||
<include name="**/magicbees/**" />
|
||||
<include name="**/forestry/**" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy todir="${clientsrc.dir}" overwrite="true" failonerror="true">
|
||||
<fileset dir="${src.dir}/magicbees_src">
|
||||
<include name="**/VersionInfo.java" />
|
||||
</fileset>
|
||||
<filterset>
|
||||
<filter token="MCVERSION" value="${mc.version}" />
|
||||
<filter token="VERSION" value="${magicbees.version}" />
|
||||
<filter token="BUILD_NUMBER" value="${build.number}" />
|
||||
<filter token="FINGERPRINT" value="${key.fingerprint}" />
|
||||
</filterset>
|
||||
</copy>
|
||||
|
||||
</target>
|
||||
|
||||
<!-- COMPILATION -->
|
||||
<target name="compile">
|
||||
|
||||
<!-- Recompile -->
|
||||
<exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
|
||||
<arg line="/c recompile.bat"/>
|
||||
</exec>
|
||||
|
||||
<exec dir="${mcp.dir}" executable="sh" osfamily="unix">
|
||||
<arg value="recompile.sh" />
|
||||
</exec>
|
||||
|
||||
<!-- Reobf -->
|
||||
<exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
|
||||
<arg line="/c reobfuscate_srg.bat"/>
|
||||
</exec>
|
||||
|
||||
<exec dir="${mcp.dir}" executable="sh" osfamily="unix">
|
||||
<arg value="reobfuscate.sh_srg" />
|
||||
</exec>
|
||||
|
||||
<!-- Copy classes -->
|
||||
<copy todir="${classes.dir}/client">
|
||||
<fileset dir="${mcp.dir}/reobf/minecraft">
|
||||
<exclude name="forestry/api/**" />
|
||||
|
||||
<include name="**/magicbees/**" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!-- Copy magicBees resources -->
|
||||
<copy todir="${classes.dir}/client">
|
||||
<fileset dir="${src.dir}/magicbees_res">
|
||||
<exclude name="build.xml"/>
|
||||
<exclude name="build.number"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy todir="${classes.dir}/client" overwrite="true" failonerror="true">
|
||||
<fileset dir="${src.dir}/magicbees_res">
|
||||
<include name="**/mcmod.info" />
|
||||
</fileset>
|
||||
<filterset>
|
||||
<filter token="MODVERSION" value="${magicbees.version}" />
|
||||
<filter token="BUILD_NUMBER" value="${build.number}" />
|
||||
</filterset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<!-- Package the jars -->
|
||||
<target name="package" depends="setup,compile">
|
||||
<echo message="Packaging basic jar..." />
|
||||
<jar destfile="${jar.dir}/magicbees-${magicbees.version}-${build.number}.jar" basedir="${classes.dir}/client"/>
|
||||
</target>
|
||||
|
||||
<!-- Clean build target without copying of jars -->
|
||||
<target name="main" depends="clean,package" />
|
||||
|
||||
<target name="fullbuild" depends="forgeclean,package" />
|
||||
|
||||
</project>
|
||||
@@ -1,76 +0,0 @@
|
||||
package magicbees.world;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.Random;
|
||||
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.utils.ChunkCoords;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.common.ITickHandler;
|
||||
import cpw.mods.fml.common.TickType;
|
||||
|
||||
public class WorldTicker implements ITickHandler
|
||||
{
|
||||
private WorldGeneratorHandler parent;
|
||||
private HashMap<Integer, LinkedList<ChunkCoords>> chunkRegenList;
|
||||
|
||||
public WorldTicker(WorldGeneratorHandler p)
|
||||
{
|
||||
this.parent = p;
|
||||
this.chunkRegenList = new HashMap<Integer, LinkedList<ChunkCoords>>();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tickStart(EnumSet<TickType> type, Object... tickData) { }
|
||||
|
||||
@Override
|
||||
public void tickEnd(EnumSet<TickType> type, Object... tickData)
|
||||
{
|
||||
World world = (World)tickData[0];
|
||||
int dimensionID = world.provider.dimensionId;
|
||||
LinkedList<ChunkCoords> chunkList = chunkRegenList.get(dimensionID);
|
||||
|
||||
if (chunkList != null && chunkList.peekFirst() != null)
|
||||
{
|
||||
ChunkCoords coords = chunkList.removeFirst();
|
||||
|
||||
// This bit is from FML's GameRegistry.generateWorld where the seed is constructed.
|
||||
long worldSeed = world.getSeed();
|
||||
Random random = new Random(worldSeed);
|
||||
long xSeed = random.nextLong() >> 2 + 1L;
|
||||
long zSeed = random.nextLong() >> 2 + 1L;
|
||||
random.setSeed((xSeed * coords.xCoord + zSeed * coords.zCoord) ^ worldSeed);
|
||||
|
||||
parent.generateWorld(world, random, coords.xCoord, coords.zCoord, false);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<TickType> ticks()
|
||||
{
|
||||
return EnumSet.of(TickType.WORLD);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getLabel()
|
||||
{
|
||||
return CommonProxy.DOMAIN + ".world";
|
||||
}
|
||||
|
||||
public void queueChunkCoords(ChunkCoords coords)
|
||||
{
|
||||
if (!chunkRegenList.containsKey(coords.dimension))
|
||||
{
|
||||
chunkRegenList.put(coords.dimension, new LinkedList<ChunkCoords>());
|
||||
}
|
||||
chunkRegenList.get(coords.dimension).addLast(coords);
|
||||
}
|
||||
|
||||
public LinkedList<ChunkCoords> getChunksToGen(int dimensionId)
|
||||
{
|
||||
return chunkRegenList.get(dimensionId);
|
||||
}
|
||||
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+10
-8
@@ -3,6 +3,7 @@ package magicbees.bees;
|
||||
import java.util.HashMap;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
@@ -35,12 +36,12 @@ public class AlleleEffectCrumbling extends AlleleEffect
|
||||
{
|
||||
super(id, isDominant, 600);
|
||||
|
||||
addPairToMap(new ItemStack(Block.stone), new ItemStack(Block.cobblestone));
|
||||
addPairToMap(new ItemStack(Block.cobblestone), new ItemStack(Block.cobblestoneMossy));
|
||||
addPairToMap(new ItemStack(Block.stoneBrick, 1, 0), new ItemStack(Block.stoneBrick, 1, 2));
|
||||
addPairToMap(new ItemStack(Block.stoneBrick, 1, 2), new ItemStack(Block.stoneBrick, 1, 1));
|
||||
addPairToMap(new ItemStack(Block.cobblestoneWall), new ItemStack(Block.cobblestoneWall, 1, 1));
|
||||
addPairToMap(new ItemStack(Block.gravel), new ItemStack(Block.sand));
|
||||
addPairToMap(new ItemStack(Blocks.stone), new ItemStack(Blocks.cobblestone));
|
||||
addPairToMap(new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.mossy_cobblestone));
|
||||
addPairToMap(new ItemStack(Blocks.stonebrick, 1, 0), new ItemStack(Blocks.stonebrick, 1, 2));
|
||||
addPairToMap(new ItemStack(Blocks.stonebrick, 1, 2), new ItemStack(Blocks.stonebrick, 1, 1));
|
||||
addPairToMap(new ItemStack(Blocks.cobblestone_wall), new ItemStack(Blocks.cobblestone_wall, 1, 1));
|
||||
addPairToMap(new ItemStack(Blocks.gravel), new ItemStack(Blocks.sand));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -66,7 +67,7 @@ public class AlleleEffectCrumbling extends AlleleEffect
|
||||
zCoord = housing.getZCoord() + world.rand.nextInt(zCoord) - zCoord / 2;
|
||||
|
||||
boolean success = false;
|
||||
Block block = Block.blocksList[world.getBlockId(xCoord, yCoord, zCoord)];
|
||||
Block block = world.getBlock(xCoord, yCoord, zCoord);
|
||||
if (block != null)
|
||||
{
|
||||
ItemStack source = new ItemStack(block, 1, world.getBlockMetadata(xCoord, yCoord, zCoord));
|
||||
@@ -75,7 +76,8 @@ public class AlleleEffectCrumbling extends AlleleEffect
|
||||
if (OreDictionary.itemMatches(source, key, false))
|
||||
{
|
||||
ItemStack target = crumbleMap.get(key);
|
||||
world.setBlock(xCoord, yCoord, zCoord, target.itemID, target.getItemDamage(), 2);
|
||||
world.setBlock(xCoord, yCoord, zCoord, Block.getBlockFromItem(target.getItem()),
|
||||
target.getItemDamage(), 2);
|
||||
|
||||
break;
|
||||
}
|
||||
+2
-1
@@ -6,6 +6,7 @@ import java.util.List;
|
||||
import magicbees.main.MagicBees;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
@@ -44,7 +45,7 @@ public class AlleleEffectCure extends AlleleEffect
|
||||
if (e instanceof EntityPlayer)
|
||||
{
|
||||
EntityPlayer player = (EntityPlayer)e;
|
||||
player.curePotionEffects(new ItemStack(Item.bucketMilk));
|
||||
player.curePotionEffects(new ItemStack(Items.milk_bucket));
|
||||
}
|
||||
}
|
||||
storedData.setInteger(0, 0);
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1
-1
@@ -45,7 +45,7 @@ public class AlleleEffectTransmuting extends AlleleEffect
|
||||
|
||||
BiomeGenBase biome = world.getBiomeGenForCoords(xCoord, zCoord);
|
||||
TransmutationEffectController.instance.attemptTransmutations(world, biome,
|
||||
new ItemStack(world.getBlockId(xCoord, yCoord, zCoord), 1, world.getBlockMetadata(xCoord, yCoord, zCoord)),
|
||||
new ItemStack(world.getBlock(xCoord, yCoord, zCoord), 1, world.getBlockMetadata(xCoord, yCoord, zCoord)),
|
||||
xCoord, yCoord, zCoord);
|
||||
|
||||
storedData.setInteger(0, 0);
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+5
-4
@@ -1,14 +1,15 @@
|
||||
package magicbees.bees;
|
||||
|
||||
|
||||
import magicbees.main.utils.compat.ExtraBeesHelper;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import forestry.api.apiculture.EnumBeeChromosome;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.core.ItemInterface;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import magicbees.main.utils.compat.ExtraBeesHelper;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
|
||||
/**
|
||||
* Simply a class to hold all the functions to manage species' default genomes.
|
||||
File renamed without changes.
+21
-37
@@ -14,6 +14,7 @@ import magicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import magicbees.main.utils.compat.ThermalExpansionHelper;
|
||||
import magicbees.main.utils.compat.RedstoneArsenalHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.BiomeDictionary;
|
||||
import net.minecraftforge.common.BiomeDictionary.Type;
|
||||
@@ -75,13 +76,13 @@ public class BeeMutation implements IBeeMutation
|
||||
new BeeMutation(BeeSpecies.ARCANE, BeeSpecies.SUPERNATURAL, BeeSpecies.ETHEREAL, 7);
|
||||
|
||||
new BeeMutation(BeeSpecies.SUPERNATURAL, BeeSpecies.ETHEREAL, BeeSpecies.WINDY, 14)
|
||||
.setBlockRequired(18);
|
||||
.setBlockRequired(Blocks.leaves);
|
||||
new BeeMutation(BeeSpecies.SUPERNATURAL, BeeSpecies.ETHEREAL, BeeSpecies.WATERY, 14)
|
||||
.setBlockRequired(Block.waterStill);
|
||||
.setBlockRequired(Blocks.water);
|
||||
new BeeMutation(BeeSpecies.SUPERNATURAL, BeeSpecies.ETHEREAL, BeeSpecies.EARTHY, 100)//14)
|
||||
.setBlockRequired(Block.brick);
|
||||
.setBlockRequired(Blocks.brick_block);
|
||||
new BeeMutation(BeeSpecies.SUPERNATURAL, BeeSpecies.ETHEREAL, BeeSpecies.FIREY, 14)
|
||||
.setBlockRequired(Block.lavaStill);
|
||||
.setBlockRequired(Blocks.lava);
|
||||
|
||||
new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.ATTUNED, BeeSpecies.AWARE, 10);
|
||||
new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.AWARE, BeeSpecies.SPIRIT, 8);
|
||||
@@ -132,7 +133,7 @@ public class BeeMutation implements IBeeMutation
|
||||
.setBlockRequired("blockTin");
|
||||
}
|
||||
new BeeMutation(Allele.getBaseSpecies("Common"), Allele.getBaseSpecies("Industrious"), BeeSpecies.IRON, 12)
|
||||
.setBlockRequired(Block.blockIron);
|
||||
.setBlockRequired(Blocks.iron_block);
|
||||
if (BeeSpecies.LEAD.isActive())
|
||||
{
|
||||
baseA = (BeeSpecies.TIN.isActive()) ? BeeSpecies.TIN : (BeeSpecies.COPPER.isActive()) ? BeeSpecies.COPPER : BeeSpecies.IRON;
|
||||
@@ -153,7 +154,7 @@ public class BeeMutation implements IBeeMutation
|
||||
baseA = (BeeSpecies.EE_MINIUM.isActive()) ? BeeSpecies.EE_MINIUM : Allele.getBaseSpecies("Imperial");
|
||||
baseB = (BeeSpecies.LEAD.isActive()) ? BeeSpecies.LEAD : BeeSpecies.IRON;
|
||||
new BeeMutation(baseA, baseB, BeeSpecies.GOLD, 8)
|
||||
.setBlockRequired(Block.blockGold);
|
||||
.setBlockRequired(Blocks.gold_block);
|
||||
|
||||
if (BeeSpecies.ALUMINUM.isActive())
|
||||
{
|
||||
@@ -177,10 +178,10 @@ public class BeeMutation implements IBeeMutation
|
||||
}
|
||||
|
||||
new BeeMutation(Allele.getBaseSpecies("Austere"), BeeSpecies.GOLD, BeeSpecies.DIAMOND, 7)
|
||||
.setBlockRequired(Block.blockDiamond);
|
||||
.setBlockRequired(Blocks.diamond_block);
|
||||
baseA = (BeeSpecies.SILVER.isActive()) ? BeeSpecies.SILVER : Allele.getBaseSpecies("Imperial");
|
||||
new BeeMutation(Allele.getBaseSpecies("Austere"), baseA, BeeSpecies.EMERALD, 6)
|
||||
.setBlockRequired(Block.blockEmerald);
|
||||
.setBlockRequired(Blocks.emerald_block);
|
||||
new BeeMutation(Allele.getBaseSpecies("Rural"), BeeSpecies.COPPER, BeeSpecies.APATITE, 12)
|
||||
.setBlockRequired("oreApatite");
|
||||
|
||||
@@ -263,13 +264,13 @@ public class BeeMutation implements IBeeMutation
|
||||
.setBlockRequired("blockBronze");
|
||||
|
||||
new BeeMutation(BeeSpecies.SPITEFUL, BeeSpecies.TIN, BeeSpecies.TE_COAL, 12)
|
||||
.setBlockRequired(Block.oreCoal);
|
||||
.setBlockRequired(Blocks.coal_ore);
|
||||
|
||||
new BeeMutation(BeeSpecies.SPITEFUL, Allele.getBaseSpecies("Industrious"), BeeSpecies.TE_DESTABILIZED, 12)
|
||||
.setBlockRequired(Block.oreRedstone);
|
||||
.setBlockRequired(Blocks.redstone_ore);
|
||||
|
||||
new BeeMutation(BeeSpecies.SMOULDERING, BeeSpecies.INFERNAL, BeeSpecies.TE_LUX, 12)
|
||||
.setBlockRequired(Block.glowStone);
|
||||
.setBlockRequired(Blocks.glowstone);
|
||||
|
||||
new BeeMutation(BeeSpecies.SMOULDERING, Allele.getBaseSpecies("Austere"), BeeSpecies.TE_DANTE, 12)
|
||||
.setBiomeRequired(BiomeDictionary.Type.NETHER);
|
||||
@@ -300,7 +301,7 @@ public class BeeMutation implements IBeeMutation
|
||||
private boolean nodeRequired;
|
||||
private double nodeRange;
|
||||
private boolean requiresBlock;
|
||||
private int requiredBlockId;
|
||||
private Block requiredBlock;
|
||||
private int requiredBlockMeta;
|
||||
private String requiredBlockOreDictEntry;
|
||||
private String requiredBlockName;
|
||||
@@ -359,21 +360,20 @@ public class BeeMutation implements IBeeMutation
|
||||
if (this.requiresBlock)
|
||||
{
|
||||
Block blockBelow;
|
||||
int blockId;
|
||||
int blockMeta;
|
||||
int i = 1;
|
||||
do
|
||||
{
|
||||
blockId = housing.getWorld().getBlockId(housing.getXCoord(), housing.getYCoord() - i, housing.getZCoord());
|
||||
blockBelow = housing.getWorld().getBlock(housing.getXCoord(), housing.getYCoord() - i,
|
||||
housing.getZCoord());
|
||||
blockMeta = housing.getWorld().getBlockMetadata(housing.getXCoord(), housing.getYCoord() - i, housing.getZCoord());
|
||||
blockBelow = Block.blocksList[blockId];
|
||||
++i;
|
||||
}
|
||||
while (blockBelow != null && (blockBelow instanceof IBeeHousing || blockBelow == Config.fAlvearyBlock));
|
||||
|
||||
if (this.requiredBlockOreDictEntry != null)
|
||||
{
|
||||
int dicId = OreDictionary.getOreID(new ItemStack(blockId, 1, blockMeta));
|
||||
int dicId = OreDictionary.getOreID(new ItemStack(blockBelow, 1, blockMeta));
|
||||
if (dicId != -1)
|
||||
{
|
||||
if (!OreDictionary.getOreName(dicId).equals(this.requiredBlockOreDictEntry))
|
||||
@@ -386,7 +386,8 @@ public class BeeMutation implements IBeeMutation
|
||||
chance = 0;
|
||||
}
|
||||
}
|
||||
else if (this.requiredBlockId != blockId || (this.requiredBlockMeta != OreDictionary.WILDCARD_VALUE && this.requiredBlockMeta != blockMeta))
|
||||
else if (this.requiredBlock != blockBelow || (this.requiredBlockMeta != OreDictionary.WILDCARD_VALUE &&
|
||||
this.requiredBlockMeta != blockMeta))
|
||||
{
|
||||
chance = 0;
|
||||
}
|
||||
@@ -502,7 +503,7 @@ public class BeeMutation implements IBeeMutation
|
||||
meta = this.requiredBlockMeta;
|
||||
}
|
||||
conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresBlock"),
|
||||
new ItemStack(this.requiredBlockId, 1, this.requiredBlockMeta).getDisplayName()));
|
||||
new ItemStack(this.requiredBlock, 1, this.requiredBlockMeta).getDisplayName()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -539,27 +540,10 @@ public class BeeMutation implements IBeeMutation
|
||||
return isSecret;
|
||||
}
|
||||
|
||||
public BeeMutation setBlockRequired(int blockId)
|
||||
{
|
||||
this.requiresBlock = true;
|
||||
this.requiredBlockId = blockId;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public BeeMutation setBlockRequired(Block block)
|
||||
{
|
||||
this.requiresBlock = true;
|
||||
this.requiredBlockId = block.blockID;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public BeeMutation setBlockAndMetaRequired(int blockId, int meta)
|
||||
{
|
||||
this.requiresBlock = true;
|
||||
this.requiredBlockId = blockId;
|
||||
this.requiredBlockMeta = meta;
|
||||
this.requiredBlock = block;
|
||||
|
||||
return this;
|
||||
}
|
||||
@@ -567,7 +551,7 @@ public class BeeMutation implements IBeeMutation
|
||||
public BeeMutation setBlockAndMetaRequired(Block block, int meta)
|
||||
{
|
||||
this.requiresBlock = true;
|
||||
this.requiredBlockId = block.blockID;
|
||||
this.requiredBlock = block;
|
||||
this.requiredBlockMeta = meta;
|
||||
|
||||
return this;
|
||||
+40
-63
@@ -1,49 +1,26 @@
|
||||
package magicbees.bees;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import magicbees.item.types.CombType;
|
||||
import magicbees.item.types.DropType;
|
||||
import magicbees.item.types.NuggetType;
|
||||
import magicbees.item.types.PollenType;
|
||||
import magicbees.item.types.ResourceType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import magicbees.main.utils.compat.ArsMagicaHelper;
|
||||
import magicbees.main.utils.compat.EquivalentExchangeHelper;
|
||||
import magicbees.main.utils.compat.ForestryHelper;
|
||||
import magicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import magicbees.main.utils.compat.ThermalExpansionHelper;
|
||||
import magicbees.main.utils.compat.RedstoneArsenalHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.apiculture.EnumBeeChromosome;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.apiculture.IBeeRoot;
|
||||
import forestry.api.apiculture.*;
|
||||
import forestry.api.core.EnumHumidity;
|
||||
import forestry.api.core.EnumTemperature;
|
||||
import forestry.api.core.IIconProvider;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IClassification;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.IMutation;
|
||||
import forestry.api.genetics.*;
|
||||
import magicbees.item.types.*;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import magicbees.main.utils.compat.*;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
{
|
||||
@@ -498,7 +475,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
.setGenome(BeeGenomeManager.getTemplateEarthy())
|
||||
.register();
|
||||
WATERY.addProduct(Config.combs.getStackForType(CombType.WATERY), 25)
|
||||
.addSpecialty(new ItemStack(Block.ice), 2)
|
||||
.addSpecialty(new ItemStack(Blocks.ice), 2)
|
||||
.setGenome(BeeGenomeManager.getTemplateWatery())
|
||||
.register();
|
||||
|
||||
@@ -528,17 +505,17 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
.setGenome(BeeGenomeManager.getTemplateSkulking())
|
||||
.register();
|
||||
GHASTLY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 8)
|
||||
.addSpecialty(new ItemStack(Item.ghastTear), 2)
|
||||
.addSpecialty(new ItemStack(Items.ghast_tear), 2)
|
||||
.setGenome(BeeGenomeManager.getTemplateGhastly())
|
||||
.register();
|
||||
SPIDERY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 13)
|
||||
.addProduct(new ItemStack(Item.silk), 8)
|
||||
.addSpecialty(new ItemStack(Item.spiderEye), 8)
|
||||
.addProduct(new ItemStack(Items.string), 8)
|
||||
.addSpecialty(new ItemStack(Items.spider_eye), 8)
|
||||
.setGenome(BeeGenomeManager.getTemplateSpidery())
|
||||
.register();
|
||||
SMOULDERING.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10)
|
||||
.addProduct(Config.combs.getStackForType(CombType.MOLTEN), 10)
|
||||
.addSpecialty(new ItemStack(Item.blazeRod), 5)
|
||||
.addSpecialty(new ItemStack(Items.blaze_rod), 5)
|
||||
.setGenome(BeeGenomeManager.getTemplateSmouldering())
|
||||
.register();
|
||||
|
||||
@@ -587,7 +564,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
.setGenome(BeeGenomeManager.getTemplateIron())
|
||||
.register();
|
||||
GOLD.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
|
||||
.addSpecialty(new ItemStack(Item.goldNugget, 1), 16)
|
||||
.addSpecialty(new ItemStack(Items.gold_nugget, 1), 16)
|
||||
.setGenome(BeeGenomeManager.getTemplateGold())
|
||||
.register();
|
||||
COPPER.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
|
||||
@@ -725,11 +702,11 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
.register();
|
||||
|
||||
TC_BRAINY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10)
|
||||
.addProduct(new ItemStack(Item.rottenFlesh), 6)
|
||||
.addProduct(new ItemStack(Items.rotten_flesh), 6)
|
||||
.setGenome(BeeGenomeManager.getTemplateTCBrainy())
|
||||
.register();
|
||||
TC_BATTY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10)
|
||||
.addSpecialty(new ItemStack(Item.gunpowder), 4)
|
||||
.addSpecialty(new ItemStack(Items.gunpowder), 4)
|
||||
.setGenome(BeeGenomeManager.getTemplateTCBatty())
|
||||
.register();
|
||||
TC_WISPY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 22)
|
||||
@@ -891,31 +868,31 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
|
||||
TE_DANTE.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10)
|
||||
.addProduct(Config.combs.getStackForType(CombType.MOLTEN), 10)
|
||||
.addSpecialty(new ItemStack(Item.blazePowder), 5)
|
||||
.addSpecialty(new ItemStack(Items.blaze_powder), 5)
|
||||
.setGenome(BeeGenomeManager.getTemplateTEDante())
|
||||
.register();
|
||||
|
||||
TE_PYRO.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10)
|
||||
.addProduct(Config.combs.getStackForType(CombType.MOLTEN), 10)
|
||||
.addSpecialty(new ItemStack(Item.blazePowder), 5)
|
||||
.addSpecialty(new ItemStack(Items.blaze_powder), 5)
|
||||
.setGenome(BeeGenomeManager.getTemplateTEPyro())
|
||||
.register();
|
||||
|
||||
TE_DESTABILIZED.addProduct(Config.combs.getStackForType(CombType.TE_DESTABILIZED), 10)
|
||||
.addProduct(Config.combs.getStackForType(CombType.OCCULT), 10)
|
||||
.addSpecialty(new ItemStack(Item.redstone), 5)
|
||||
.addSpecialty(new ItemStack(Items.redstone), 5)
|
||||
.setGenome(BeeGenomeManager.getTemplateTEDestabilized())
|
||||
.register();
|
||||
|
||||
TE_LUX.addProduct(Config.combs.getStackForType(CombType.TE_LUX), 10)
|
||||
.addProduct(Config.combs.getStackForType(CombType.OCCULT), 10)
|
||||
.addSpecialty(new ItemStack(Item.glowstone), 5)
|
||||
.addSpecialty(new ItemStack(Items.glowstone_dust), 5)
|
||||
.setGenome(BeeGenomeManager.getTemplateTELux())
|
||||
.register();
|
||||
|
||||
TE_WINSOME.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10)
|
||||
.addProduct(Config.combs.getStackForType(CombType.TE_ENDEARING), 5)
|
||||
.addSpecialty(new ItemStack(Item.enderPearl), 5)
|
||||
.addSpecialty(new ItemStack(Items.ender_pearl), 5)
|
||||
.setGenome(BeeGenomeManager.getTemplateTEWinsome())
|
||||
.register();
|
||||
|
||||
@@ -926,7 +903,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
|
||||
TE_COAL.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
|
||||
.addProduct(Config.combs.getStackForType(CombType.TE_CARBON), 5)
|
||||
.addSpecialty(new ItemStack(Item.coal), 5)
|
||||
.addSpecialty(new ItemStack(Items.coal), 5)
|
||||
.setGenome(BeeGenomeManager.getTemplateTECoal())
|
||||
.register();
|
||||
|
||||
@@ -960,7 +937,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
private int complexity;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private Icon[][] icons;
|
||||
private IIcon[][] icons;
|
||||
|
||||
private final static int defaultBodyColour = 0xFF7C26;
|
||||
|
||||
@@ -1188,7 +1165,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIcon(EnumBeeType type, int renderPass)
|
||||
public IIcon getIcon(EnumBeeType type, int renderPass)
|
||||
{
|
||||
return icons[type.ordinal()][Math.min(renderPass, 2)];
|
||||
}
|
||||
@@ -1248,16 +1225,16 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
}
|
||||
if (value <= 0f)
|
||||
{
|
||||
if (itemStack.itemID == Config.fHoneyDrop.itemID)
|
||||
if (itemStack.getItem() == Config.fHoneyDrop)
|
||||
{
|
||||
|
||||
}
|
||||
else if (itemStack.itemID == Config.fHoneydew.itemID)
|
||||
else if (itemStack.getItem() == Config.fHoneydew)
|
||||
{
|
||||
|
||||
}
|
||||
else if (itemStack.itemID == Config.fBeeComb.itemID ||
|
||||
itemStack.itemID == Config.combs.itemID)
|
||||
else if (itemStack.getItem() == Config.fBeeComb ||
|
||||
itemStack.getItem() == Config.combs)
|
||||
{
|
||||
value = 4f;
|
||||
}
|
||||
@@ -1322,13 +1299,13 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIcons(IconRegister itemMap)
|
||||
public void registerIcons(IIconRegister itemMap)
|
||||
{
|
||||
this.icons = new Icon[EnumBeeType.values().length][3];
|
||||
this.icons = new IIcon[EnumBeeType.values().length][3];
|
||||
|
||||
String root = this.getIconPath();
|
||||
|
||||
Icon body1 = itemMap.registerIcon(root + "body1");
|
||||
IIcon body1 = itemMap.registerIcon(root + "body1");
|
||||
|
||||
for (int i = 0; i < EnumBeeType.values().length; i++)
|
||||
{
|
||||
@@ -1367,7 +1344,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIcon(short texUID)
|
||||
public IIcon getIcon(short texUID)
|
||||
{
|
||||
return icons[0][0];
|
||||
}
|
||||
File renamed without changes.
+19
-18
@@ -3,6 +3,7 @@ package magicbees.bees;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import forestry.api.genetics.IFlowerProvider;
|
||||
@@ -19,10 +20,10 @@ public class FlowerProviderArsMagicaFlower implements IFlowerProvider
|
||||
public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z)
|
||||
{
|
||||
boolean flag = false;
|
||||
int id = world.getBlockId(x, y, z);
|
||||
if (id == Config.amBlackOrchid.blockID || id == Config.amDesertNova.blockID ||
|
||||
id == Config.amAum.blockID || id == Config.amWakebloom.blockID ||
|
||||
id == Config.amTarmaRoot.blockID)
|
||||
Block block = world.getBlock(x, y, z);
|
||||
if (block == Config.amBlackOrchid || block == Config.amDesertNova ||
|
||||
block == Config.amAum || block == Config.amWakebloom ||
|
||||
block == Config.amTarmaRoot)
|
||||
{
|
||||
flag = true;
|
||||
}
|
||||
@@ -34,41 +35,41 @@ public class FlowerProviderArsMagicaFlower implements IFlowerProvider
|
||||
{
|
||||
boolean flag = false;
|
||||
x = -222; y = 70; z = -51;
|
||||
int blockDown = world.getBlockId(x, y - 1, z);
|
||||
if (world.getBlockId(x, y, z) == 0)
|
||||
Block blockDown = world.getBlock(x, y - 1, z);
|
||||
if (world.getBlock(x, y, z).isAir(world, x, y, z))
|
||||
{
|
||||
if (blockDown == Block.dirt.blockID || blockDown == Block.grass.blockID)
|
||||
if (blockDown == Blocks.dirt || blockDown == Blocks.grass)
|
||||
{
|
||||
int dart = world.rand.nextInt(100);
|
||||
int id;
|
||||
Block block;
|
||||
if (dart > 60)
|
||||
{
|
||||
id = Config.amBlackOrchid.blockID;
|
||||
block = Config.amBlackOrchid;
|
||||
}
|
||||
else if (dart > 30)
|
||||
{
|
||||
id = Config.amAum.blockID;
|
||||
block = Config.amAum;
|
||||
}
|
||||
else
|
||||
{
|
||||
id = Config.amTarmaRoot.blockID;
|
||||
block = Config.amTarmaRoot;
|
||||
}
|
||||
world.setBlock(x, y, z, id);
|
||||
world.setBlock(x, y, z, block);
|
||||
flag = true;
|
||||
}
|
||||
else if (blockDown == Block.sand.blockID)
|
||||
else if (blockDown == Blocks.sand)
|
||||
{
|
||||
world.setBlock(x, y, z, Config.amDesertNova.blockID);
|
||||
world.setBlock(x, y, z, Config.amDesertNova);
|
||||
flag = true;
|
||||
}
|
||||
else if (blockDown == Block.stone.blockID)
|
||||
else if (blockDown == Blocks.stone)
|
||||
{
|
||||
world.setBlock(x, y, z, Config.amTarmaRoot.blockID);
|
||||
world.setBlock(x, y, z, Config.amTarmaRoot);
|
||||
flag = true;
|
||||
}
|
||||
else if (blockDown == Block.waterMoving.blockID || blockDown == Block.waterStill.blockID)
|
||||
else if (blockDown == Blocks.water || blockDown == Blocks.water)
|
||||
{
|
||||
world.setBlock(x, y, z, Config.amWakebloom.blockID);
|
||||
world.setBlock(x, y, z, Config.amWakebloom);
|
||||
flag = true;
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -74,12 +74,12 @@ public class FlowerProviderAuraNode implements IFlowerProvider
|
||||
{
|
||||
for (ItemStack stack : products)
|
||||
{
|
||||
if (stack.itemID == itemStack.itemID && stack.getItemDamage() == itemStack.getItemDamage())
|
||||
if (stack.getItem() == itemStack.getItem() && stack.getItemDamage() == itemStack.getItemDamage())
|
||||
{
|
||||
if (stack.stackSize < stack.getItem().getItemStackLimit())
|
||||
if (stack.stackSize < stack.getItem().getItemStackLimit(stack))
|
||||
{
|
||||
stack.stackSize += itemStack.stackSize;
|
||||
itemStack.stackSize = Math.max(stack.stackSize - stack.getItem().getItemStackLimit(), 0);
|
||||
itemStack.stackSize = Math.max(stack.stackSize - stack.getItem().getItemStackLimit(stack), 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -4,6 +4,7 @@ import java.util.EnumSet;
|
||||
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.EnumPlantType;
|
||||
@@ -18,7 +19,7 @@ public class FlowerProviderBookshelf implements IFlowerProvider
|
||||
public boolean isAcceptedFlower(World world, IIndividual genome, int x, int i, int j)
|
||||
{
|
||||
boolean flag = false;
|
||||
if (world.getBlockId(x, i, j) == Block.bookShelf.blockID)
|
||||
if (world.getBlock(x, i, j) == Blocks.bookshelf)
|
||||
{
|
||||
flag = true;
|
||||
}
|
||||
@@ -39,7 +40,7 @@ public class FlowerProviderBookshelf implements IFlowerProvider
|
||||
|
||||
public ItemStack[] getItemStacks()
|
||||
{
|
||||
return new ItemStack[] { new ItemStack(Block.bookShelf) };
|
||||
return new ItemStack[] { new ItemStack(Blocks.bookshelf) };
|
||||
}
|
||||
|
||||
@Override
|
||||
+8
-7
@@ -4,6 +4,7 @@ import magicbees.main.Config;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import magicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import forestry.api.genetics.IFlowerProvider;
|
||||
@@ -18,7 +19,7 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider
|
||||
public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z)
|
||||
{
|
||||
boolean flag = false;
|
||||
if (world.getBlockId(x, y, z) == Config.tcPlant.blockID)
|
||||
if (world.getBlock(x, y, z) == Config.tcPlant)
|
||||
{
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
if (meta == 2 || meta == 3)
|
||||
@@ -33,17 +34,17 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider
|
||||
public boolean growFlower(World world, IIndividual genome, int x, int y, int z)
|
||||
{
|
||||
boolean flag = false;
|
||||
int blockDown = world.getBlockId(x, y - 1, z);
|
||||
if (world.getBlockId(x, y, z) == 0)
|
||||
Block blockDown = world.getBlock(x, y - 1, z);
|
||||
if (world.getBlock(x, y, z).isAir(world, x, y, z))
|
||||
{
|
||||
if (blockDown == Block.dirt.blockID || blockDown == Block.grass.blockID)
|
||||
if (blockDown == Blocks.dirt || blockDown == Blocks.grass)
|
||||
{
|
||||
world.setBlockMetadataWithNotify(x, y, z, Config.tcPlant.blockID, ThaumcraftHelper.BlockPlant.SHIMMERLEAF.ordinal());
|
||||
world.setBlock(x, y, z, Config.tcPlant, ThaumcraftHelper.BlockPlant.SHIMMERLEAF.ordinal(), 2);
|
||||
flag = true;
|
||||
}
|
||||
else if (blockDown == Block.sand.blockID)
|
||||
else if (blockDown == Blocks.sand)
|
||||
{
|
||||
world.setBlockMetadataWithNotify(x, y, z, Config.tcPlant.blockID, ThaumcraftHelper.BlockPlant.CINDERPEARL.ordinal());
|
||||
world.setBlock(x, y, z, Config.tcPlant, ThaumcraftHelper.BlockPlant.CINDERPEARL.ordinal(), 2);
|
||||
flag = true;
|
||||
}
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
+5
-4
@@ -4,6 +4,7 @@ import java.util.Locale;
|
||||
|
||||
import magicbees.api.bees.ITransmutationEffectLogic;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.biome.BiomeGenBase;
|
||||
@@ -17,8 +18,8 @@ public class TransmutationEffectRailcraft implements ITransmutationEffectLogic
|
||||
public boolean tryTransmutation(World world, BiomeGenBase biome, ItemStack sourceBlock, int x, int y, int z)
|
||||
{
|
||||
boolean flag = false;
|
||||
if (OreDictionary.itemMatches(new ItemStack(Block.stone), sourceBlock, false) ||
|
||||
OreDictionary.itemMatches(new ItemStack(Block.cobblestone), sourceBlock, false))
|
||||
if (OreDictionary.itemMatches(new ItemStack(Blocks.stone), sourceBlock, false) ||
|
||||
OreDictionary.itemMatches(new ItemStack(Blocks.cobblestone), sourceBlock, false))
|
||||
{
|
||||
flag = trySpawnQuarriedStone(world, biome, sourceBlock, x, y, z) ||
|
||||
trySpawnAbyssalStone(world, biome, sourceBlock, x, y, z);
|
||||
@@ -35,7 +36,7 @@ public class TransmutationEffectRailcraft implements ITransmutationEffectLogic
|
||||
ItemStack item = GameRegistry.findItemStack("Railcraft", "cube.stone.quarried", 1);
|
||||
if (item != null)
|
||||
{
|
||||
world.setBlock(x, y, z, item.itemID, item.getItemDamage(), 2);
|
||||
world.setBlock(x, y, z, Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 2);
|
||||
flag = true;
|
||||
}
|
||||
}
|
||||
@@ -51,7 +52,7 @@ public class TransmutationEffectRailcraft implements ITransmutationEffectLogic
|
||||
ItemStack item = GameRegistry.findItemStack("Railcraft", "cube.stone.abyssal", 1);
|
||||
if (item != null)
|
||||
{
|
||||
world.setBlock(x, y, z, item.itemID, item.getItemDamage(), 2);
|
||||
world.setBlock(x, y, z, Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 2);
|
||||
flag = true;
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -3,6 +3,7 @@ package magicbees.bees;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import magicbees.api.bees.ITransmutationEffectLogic;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.biome.BiomeGenBase;
|
||||
@@ -21,9 +22,9 @@ public class TransmutationEffectVanilla implements ITransmutationEffectLogic
|
||||
{
|
||||
boolean flag = false;
|
||||
if (BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.DESERT) &&
|
||||
OreDictionary.itemMatches(new ItemStack(Block.sand), sourceBlock, false))
|
||||
OreDictionary.itemMatches(new ItemStack(Blocks.sand), sourceBlock, false))
|
||||
{
|
||||
world.setBlock(x, y, z, Block.sandStone.blockID);
|
||||
world.setBlock(x, y, z, Blocks.sandstone);
|
||||
flag = true;
|
||||
}
|
||||
return flag;
|
||||
+11
-11
@@ -6,25 +6,25 @@ import magicbees.client.gui.UIScreens;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.MagicBees;
|
||||
import magicbees.main.utils.TabMagicBees;
|
||||
import magicbees.main.utils.VersionInfo;
|
||||
import magicbees.tileentity.TileEntityEffectJar;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class BlockEffectJar extends BlockContainer
|
||||
{
|
||||
public BlockEffectJar(int id)
|
||||
public BlockEffectJar()
|
||||
{
|
||||
super(id, Material.glass);
|
||||
super(Material.glass);
|
||||
this.setCreativeTab(TabMagicBees.tabMagicBees);
|
||||
this.setUnlocalizedName("effectJar");
|
||||
this.setBlockName("effectJar");
|
||||
this.setBlockBounds(0.25f, 0f, 0.25f, 0.75f, 0.81f, 0.74f);
|
||||
this.setHardness(0.1f);
|
||||
this.setResistance(1.5f);
|
||||
@@ -45,7 +45,7 @@ public class BlockEffectJar extends BlockContainer
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World w)
|
||||
public TileEntity createNewTileEntity(World w, int metadata)
|
||||
{
|
||||
return new TileEntityEffectJar();
|
||||
}
|
||||
@@ -69,15 +69,15 @@ public class BlockEffectJar extends BlockContainer
|
||||
}
|
||||
|
||||
@Override
|
||||
public void breakBlock(World world, int x, int y, int z, int id, int meta)
|
||||
public void breakBlock(World world, int x, int y, int z, Block block, int meta)
|
||||
{
|
||||
super.breakBlock(world, x, y, z, id, meta);
|
||||
super.breakBlock(world, x, y, z, block, meta);
|
||||
this.dropInventory(world, x, y, z);
|
||||
}
|
||||
|
||||
private void dropInventory(World world, int x, int y, int z)
|
||||
{
|
||||
TileEntity e = world.getBlockTileEntity(x, y, z);
|
||||
TileEntity e = world.getTileEntity(x, y, z);
|
||||
|
||||
if (e != null && e instanceof TileEntityEffectJar)
|
||||
{
|
||||
@@ -106,8 +106,8 @@ public class BlockEffectJar extends BlockContainer
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerBlockIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
this.blockIcon = Block.glass.getIcon(0, 0);
|
||||
this.blockIcon = Blocks.glass.getIcon(0, 0);
|
||||
}
|
||||
}
|
||||
+32
-30
@@ -1,36 +1,38 @@
|
||||
package magicbees.block;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.Tabs;
|
||||
import magicbees.block.types.HiveType;
|
||||
import magicbees.main.MagicBees;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.IWorldAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import magicbees.block.types.HiveType;
|
||||
import magicbees.main.MagicBees;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.Tabs;
|
||||
|
||||
public class BlockHive extends Block
|
||||
{
|
||||
public BlockHive(int id)
|
||||
public BlockHive()
|
||||
{
|
||||
super(id, new MaterialHive());
|
||||
this.setLightValue(0.8f);
|
||||
super(new MaterialHive());
|
||||
this.setLightLevel(0.8f);
|
||||
setHardness(1f);
|
||||
setCreativeTab(Tabs.tabApiculture);
|
||||
setUnlocalizedName("hive");
|
||||
setBlockName("hive");
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDragonDestroy(World world, int x, int y, int z)
|
||||
public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -54,7 +56,7 @@ public class BlockHive extends Block
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubBlocks(int id, CreativeTabs tab, List itemsList)
|
||||
public void getSubBlocks(Item item, CreativeTabs tab, List itemsList)
|
||||
{
|
||||
for (HiveType type : HiveType.values())
|
||||
{
|
||||
@@ -66,21 +68,21 @@ public class BlockHive extends Block
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArrayList<ItemStack> getBlockDropped(World world, int x, int y, int z, int metadata, int fortune)
|
||||
{
|
||||
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
|
||||
{
|
||||
return HiveType.getHiveFromMeta(metadata).getDrops(world, x, y, z, fortune);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister register)
|
||||
public void registerBlockIcons(IIconRegister register)
|
||||
{
|
||||
HiveType.registerIcons(register);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIcon(int side, int meta)
|
||||
public IIcon getIcon(int side, int meta)
|
||||
{
|
||||
if (meta < 0 || meta > HiveType.values().length)
|
||||
{
|
||||
@@ -92,19 +94,19 @@ public class BlockHive extends Block
|
||||
@Override
|
||||
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
|
||||
{
|
||||
int id = world.getBlockId(x, y, z);
|
||||
Block block = world.getBlock(x, y, z);
|
||||
|
||||
if (id == 0)
|
||||
if (block.isAir(world, x, y, z))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
Item item = Item.itemsList[id];
|
||||
|
||||
Item item = Item.getItemFromBlock(block);
|
||||
if (item == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return new ItemStack(id, 1, getDamageValue(world, x, y, z) & 7);
|
||||
return new ItemStack(item, 1, getDamageValue(world, x, y, z) & 7);
|
||||
}
|
||||
}
|
||||
+14
-12
@@ -7,27 +7,29 @@ import magicbees.main.CommonProxy;
|
||||
import magicbees.main.MagicBees;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.IIcon;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockPlanks extends Block
|
||||
{
|
||||
@SideOnly(Side.CLIENT)
|
||||
private Icon[] icons;
|
||||
private IIcon[] IIcons;
|
||||
|
||||
public BlockPlanks(int id)
|
||||
public BlockPlanks()
|
||||
{
|
||||
super(id, Material.wood);
|
||||
super(Material.wood);
|
||||
this.setHardness(2.5f);
|
||||
this.setResistance(6.0f);
|
||||
this.setCreativeTab(CreativeTabs.tabBlock);
|
||||
if (MagicBees.getConfig().AreMagicPlanksFlammable)
|
||||
{
|
||||
Block.setBurnProperties(id, 5, 20);
|
||||
Blocks.fire.setFireInfo(this, 5, 20);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,7 +41,7 @@ public class BlockPlanks extends Block
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubBlocks(int id, CreativeTabs tab, List itemsList)
|
||||
public void getSubBlocks(Item item, CreativeTabs tab, List itemsList)
|
||||
{
|
||||
for (PlankType type : PlankType.values())
|
||||
{
|
||||
@@ -49,18 +51,18 @@ public class BlockPlanks extends Block
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public Icon getIcon(int side, int meta)
|
||||
public IIcon getIcon(int side, int meta)
|
||||
{
|
||||
return this.icons[Math.max(0, Math.min(meta & 7, icons.length-1))];
|
||||
return this.IIcons[Math.max(0, Math.min(meta & 7, IIcons.length-1))];
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerBlockIcons(IIconRegister par1IIconRegister)
|
||||
{
|
||||
this.icons = new Icon[PlankType.values().length];
|
||||
this.IIcons = new IIcon[PlankType.values().length];
|
||||
for (PlankType t : PlankType.values())
|
||||
{
|
||||
this.icons[t.ordinal()] = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":" + t.name);
|
||||
this.IIcons[t.ordinal()] = par1IIconRegister.registerIcon(CommonProxy.DOMAIN + ":" + t.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
+23
-21
@@ -8,56 +8,58 @@ import magicbees.main.CommonProxy;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.MagicBees;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockHalfSlab;
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockWoodSlab extends BlockHalfSlab
|
||||
public class BlockWoodSlab extends BlockSlab
|
||||
{
|
||||
@SideOnly(Side.CLIENT)
|
||||
private Icon[] icons;
|
||||
private IIcon[] icons;
|
||||
|
||||
public BlockWoodSlab(int id, boolean doubleSlab)
|
||||
public BlockWoodSlab(boolean doubleSlab)
|
||||
{
|
||||
super(id, doubleSlab, Material.wood);
|
||||
super(doubleSlab, Material.wood);
|
||||
this.setHardness(2.5f);
|
||||
this.setResistance(6.0f);
|
||||
this.setUnlocalizedName("tb.slab.wood");
|
||||
this.setBlockName("tb.slab.wood");
|
||||
this.setCreativeTab(CreativeTabs.tabBlock);
|
||||
this.setLightOpacity(doubleSlab ? 255 : 0);
|
||||
if (MagicBees.getConfig().AreMagicPlanksFlammable)
|
||||
{
|
||||
Block.setBurnProperties(id, 5, 20);
|
||||
Blocks.fire.setFireInfo(this, 5, 20);
|
||||
}
|
||||
}
|
||||
|
||||
public int idDropped(int id, Random rand, int par3)
|
||||
@Override
|
||||
public Item getItemDropped(int id, Random rand, int par3)
|
||||
{
|
||||
return Config.slabWoodHalf.blockID;
|
||||
return Item.getItemFromBlock(Config.slabWoodHalf);
|
||||
}
|
||||
|
||||
protected ItemStack createStackedBlock(int meta)
|
||||
{
|
||||
return new ItemStack(Config.planksWood.blockID, 1, meta & 7);
|
||||
return new ItemStack(Config.planksWood, 1, meta & 7);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFullSlabName(int meta)
|
||||
public String func_150002_b(int meta)
|
||||
{
|
||||
return this.getUnlocalizedName() + "." + PlankType.getType(meta).name;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubBlocks(int id, CreativeTabs tab, List itemsList)
|
||||
public void getSubBlocks(Item item, CreativeTabs tab, List itemsList)
|
||||
{
|
||||
for (PlankType type : PlankType.values())
|
||||
{
|
||||
@@ -67,15 +69,15 @@ public class BlockWoodSlab extends BlockHalfSlab
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public Icon getIcon(int side, int meta)
|
||||
public IIcon getIcon(int side, int meta)
|
||||
{
|
||||
return this.icons[Math.max(0, Math.min(meta & 7, icons.length-1))];
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
this.icons = new Icon[PlankType.values().length];
|
||||
this.icons = new IIcon[PlankType.values().length];
|
||||
for (PlankType t : PlankType.values())
|
||||
{
|
||||
this.icons[t.ordinal()] = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":" + t.name);
|
||||
@@ -85,19 +87,19 @@ public class BlockWoodSlab extends BlockHalfSlab
|
||||
@Override
|
||||
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
|
||||
{
|
||||
int id = world.getBlockId(x, y, z);
|
||||
Block block = world.getBlock(x, y, z);
|
||||
|
||||
if (id == 0)
|
||||
if (block.isAir(world, x, y, z))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
Item item = Item.itemsList[id];
|
||||
Item item = Item.getItemFromBlock(block);
|
||||
if (item == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return new ItemStack(id, 1, getDamageValue(world, x, y, z) & 7);
|
||||
return new ItemStack(item, 1, getDamageValue(world, x, y, z) & 7);
|
||||
}
|
||||
}
|
||||
File renamed without changes.
+16
-16
@@ -1,8 +1,8 @@
|
||||
package magicbees.block.types;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Random;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.apiculture.IHiveDrop;
|
||||
import magicbees.bees.BeeGenomeManager;
|
||||
import magicbees.bees.BeeSpecies;
|
||||
import magicbees.bees.HiveDrop;
|
||||
@@ -11,17 +11,17 @@ import magicbees.main.CommonProxy;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.utils.compat.ForestryHelper;
|
||||
import magicbees.world.feature.FeatureHive;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.biome.BiomeGenBase;
|
||||
import net.minecraftforge.common.BiomeDictionary;
|
||||
import net.minecraftforge.common.BiomeDictionary.Type;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.apiculture.IHiveDrop;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Random;
|
||||
|
||||
public enum HiveType
|
||||
{
|
||||
@@ -41,7 +41,7 @@ public enum HiveType
|
||||
private ArrayList<IHiveDrop> drops;
|
||||
private ArrayList<BiomeDictionary.Type> validBiomes;
|
||||
@SideOnly(Side.CLIENT)
|
||||
private Icon[] icons;
|
||||
private IIcon[] icons;
|
||||
|
||||
public static HiveType getHiveFromMeta(int meta)
|
||||
{
|
||||
@@ -87,14 +87,14 @@ public enum HiveType
|
||||
DEEP.drops.add(new HiveDrop(BeeGenomeManager.addRainResist(BeeSpecies.ATTUNED.getGenome()), combs, 20));
|
||||
DEEP.drops.add(valiantDrop);
|
||||
|
||||
combs = new ItemStack[] {Config.combs.getStackForType(CombType.MOLTEN), new ItemStack(Item.glowstone, 6)};
|
||||
combs = new ItemStack[] {Config.combs.getStackForType(CombType.MOLTEN), new ItemStack(Items.glowstone_dust, 6)};
|
||||
|
||||
INFERNAL.validBiomes.add(Type.NETHER);
|
||||
INFERNAL.validBiomes.add(Type.MAGICAL);
|
||||
INFERNAL.drops.add(new HiveDrop(BeeSpecies.INFERNAL.getGenome(), combs, 80).setIgnoblePercentage(0.5f));
|
||||
INFERNAL.drops.add(new HiveDrop(ForestryHelper.getTemplateForestryForSpecies("Steadfast"), combs, 3));
|
||||
|
||||
combs = new ItemStack[] {Config.combs.getStackForType(CombType.FORGOTTEN), new ItemStack(Item.enderPearl, 1)};
|
||||
combs = new ItemStack[] {Config.combs.getStackForType(CombType.FORGOTTEN), new ItemStack(Items.ender_pearl, 1)};
|
||||
|
||||
OBLIVION.validBiomes.add(Type.END);
|
||||
OBLIVION.validBiomes.add(Type.MAGICAL);
|
||||
@@ -112,11 +112,11 @@ public enum HiveType
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static void registerIcons(IconRegister register)
|
||||
public static void registerIcons(IIconRegister register)
|
||||
{
|
||||
for (HiveType type : HiveType.values())
|
||||
{
|
||||
type.icons = new Icon[2];
|
||||
type.icons = new IIcon[2];
|
||||
|
||||
type.icons[0] = register.registerIcon(CommonProxy.DOMAIN + ":beehive." + type.ordinal() + ".top");
|
||||
type.icons[1] = register.registerIcon(CommonProxy.DOMAIN + ":beehive." + type.ordinal() + ".side");
|
||||
@@ -134,9 +134,9 @@ public enum HiveType
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIconForSide(int side)
|
||||
public IIcon getIconForSide(int side)
|
||||
{
|
||||
Icon i = this.icons[0];
|
||||
IIcon i = this.icons[0];
|
||||
|
||||
if (side != 0 && side != 1)
|
||||
{
|
||||
File renamed without changes.
+4
-3
@@ -1,5 +1,6 @@
|
||||
package magicbees.client.gui;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import magicbees.tileentity.TileEntityEffectJar;
|
||||
@@ -8,7 +9,6 @@ import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.ICrafting;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import forestry.api.core.ItemInterface;
|
||||
|
||||
public class ContainerEffectJar extends Container
|
||||
{
|
||||
@@ -20,7 +20,8 @@ public class ContainerEffectJar extends Container
|
||||
public ContainerEffectJar(TileEntityEffectJar tileEntityEffectJar, EntityPlayer player)
|
||||
{
|
||||
this.jar = tileEntityEffectJar;
|
||||
this.addSlotToContainer(new SlotCustomItems(this.jar, 0, 80, 22, new ItemStack[] { ItemInterface.getItem("beeDroneGE") }));
|
||||
this.addSlotToContainer(new SlotCustomItems(this.jar, 0, 80, 22, GameRegistry.findItemStack
|
||||
("forestry", "beeDroneGE", 1)));
|
||||
|
||||
for (int i = 0; i < 3; ++i)
|
||||
{
|
||||
@@ -114,7 +115,7 @@ public class ContainerEffectJar extends Container
|
||||
itemSlot.putStack(null);
|
||||
}
|
||||
itemSlot.onSlotChanged();
|
||||
player.inventory.onInventoryChanged();
|
||||
player.inventory.markDirty();
|
||||
|
||||
return null;
|
||||
}
|
||||
+1
-1
@@ -41,7 +41,7 @@ public class GUIEffectJar extends GuiContainer
|
||||
@Override
|
||||
protected void drawGuiContainerForegroundLayer(int par1, int par2)
|
||||
{
|
||||
fontRenderer.drawString("Inventory", 9, 63, 0);
|
||||
fontRendererObj.drawString("Inventory", 9, 63, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
+2
-2
@@ -15,7 +15,7 @@ public class GUIHandler implements IGuiHandler
|
||||
|
||||
if (ID == UIScreens.EFFECT_JAR.ordinal())
|
||||
{
|
||||
value = new ContainerEffectJar((TileEntityEffectJar)world.getBlockTileEntity(x, y, z), player);
|
||||
value = new ContainerEffectJar((TileEntityEffectJar)world.getTileEntity(x, y, z), player);
|
||||
}
|
||||
|
||||
return value;
|
||||
@@ -28,7 +28,7 @@ public class GUIHandler implements IGuiHandler
|
||||
|
||||
if (ID == UIScreens.EFFECT_JAR.ordinal())
|
||||
{
|
||||
value = new GUIEffectJar((TileEntityEffectJar)world.getBlockTileEntity(x, y, z), player);
|
||||
value = new GUIEffectJar((TileEntityEffectJar)world.getTileEntity(x, y, z), player);
|
||||
}
|
||||
|
||||
return value;
|
||||
+3
-3
@@ -48,7 +48,7 @@ public class SlotCustomItems extends Slot
|
||||
for (int i = 0; i < this.items.size(); ++i)
|
||||
{
|
||||
ItemStack s = this.items.get(i);
|
||||
if (s.itemID == newItem.itemID)
|
||||
if (s.getItem() == newItem.getItem())
|
||||
{
|
||||
if (s.getItemDamage() == OreDictionary.WILDCARD_VALUE)
|
||||
{
|
||||
@@ -77,7 +77,7 @@ public class SlotCustomItems extends Slot
|
||||
for (int i = 0; i < this.items.size(); ++i)
|
||||
{
|
||||
ItemStack s = this.items.get(i);
|
||||
if (s.itemID == removeItem.itemID)
|
||||
if (s.getItem() == removeItem.getItem())
|
||||
{
|
||||
if (s.getItemDamage() == OreDictionary.WILDCARD_VALUE)
|
||||
{
|
||||
@@ -99,7 +99,7 @@ public class SlotCustomItems extends Slot
|
||||
boolean flag = false;
|
||||
for (int i = 0; i < this.items.size(); ++i)
|
||||
{
|
||||
if (this.items.get(i).itemID == itemStack.itemID)
|
||||
if (this.items.get(i).getItem() == itemStack.getItem())
|
||||
{
|
||||
if (this.items.get(i).getItemDamage() == itemStack.getItemDamage())
|
||||
{
|
||||
File renamed without changes.
+1
-1
@@ -22,7 +22,7 @@ public class ModelEffectJar
|
||||
|
||||
public ModelEffectJar()
|
||||
{
|
||||
this.effectJarObj = AdvancedModelLoader.loadModel(objFile);
|
||||
this.effectJarObj = AdvancedModelLoader.loadModel(new ResourceLocation("magicbees", "model/effectJar.obj"));
|
||||
}
|
||||
|
||||
public void render()
|
||||
File renamed without changes.
+2
-2
@@ -8,9 +8,9 @@ import forestry.api.apiculture.IArmorApiarist;
|
||||
public class ItemArmorApiarist extends Item implements IArmorApiarist
|
||||
{
|
||||
|
||||
public ItemArmorApiarist(int par1)
|
||||
public ItemArmorApiarist()
|
||||
{
|
||||
super(par1);
|
||||
super();
|
||||
}
|
||||
|
||||
public static int getNumberPiecesWorn(EntityPlayer player)
|
||||
+11
-25
@@ -1,41 +1,27 @@
|
||||
package magicbees.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
import magicbees.block.types.PlankType;
|
||||
import magicbees.item.types.CapsuleType;
|
||||
import magicbees.item.types.FluidType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.MagicBees;
|
||||
import magicbees.main.utils.TabMagicBees;
|
||||
import magicbees.main.utils.VersionInfo;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumMovingObjectType;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.liquids.LiquidContainerData;
|
||||
import net.minecraftforge.liquids.LiquidContainerRegistry;
|
||||
import net.minecraftforge.liquids.LiquidDictionary;
|
||||
import net.minecraftforge.liquids.LiquidStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemCapsule extends Item
|
||||
{
|
||||
private CapsuleType capsuleType;
|
||||
|
||||
public ItemCapsule(CapsuleType type, int itemId, int maxStackSize)
|
||||
public ItemCapsule(CapsuleType type, int maxStackSize)
|
||||
{
|
||||
super(itemId);
|
||||
super();
|
||||
this.capsuleType = type;
|
||||
this.setCreativeTab(TabMagicBees.tabMagicBees);
|
||||
this.setHasSubtypes(true);
|
||||
@@ -50,7 +36,7 @@ public class ItemCapsule extends Item
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemDisplayName(ItemStack itemStack)
|
||||
public String getItemStackDisplayName(ItemStack itemStack)
|
||||
{
|
||||
return String.format(this.capsuleType.getLocalizedName(), FluidType.values()[itemStack.getItemDamage()].getDisplayName());
|
||||
}
|
||||
@@ -62,7 +48,7 @@ public class ItemCapsule extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(int par1, CreativeTabs tab, List itemList)
|
||||
public void getSubItems(Item item, CreativeTabs tab, List itemList)
|
||||
{
|
||||
for (FluidType l : FluidType.values())
|
||||
{
|
||||
@@ -81,7 +67,7 @@ public class ItemCapsule extends Item
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
this.itemIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":capsule" + this.capsuleType.getName().substring(0, 1).toUpperCase()
|
||||
+ this.capsuleType.getName().substring(1));
|
||||
@@ -96,9 +82,9 @@ public class ItemCapsule extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIconFromDamageForRenderPass(int metadata, int pass)
|
||||
public IIcon getIconFromDamageForRenderPass(int metadata, int pass)
|
||||
{
|
||||
Icon i = this.itemIcon;
|
||||
IIcon i = this.itemIcon;
|
||||
if (metadata != 0 && pass == 0)
|
||||
{
|
||||
i = FluidType.values()[Math.max(0, Math.min(metadata, FluidType.values().length - 1))].liquidIcon;
|
||||
+11
-14
@@ -1,28 +1,25 @@
|
||||
package magicbees.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.Tabs;
|
||||
import magicbees.item.types.CombType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.MagicBees;
|
||||
import magicbees.main.utils.VersionInfo;
|
||||
import magicbees.main.utils.compat.ForestryHelper;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemComb extends Item
|
||||
{
|
||||
public ItemComb(int itemID)
|
||||
public ItemComb()
|
||||
{
|
||||
super(itemID);
|
||||
super();
|
||||
this.setCreativeTab(Tabs.tabApiculture);
|
||||
this.setHasSubtypes(true);
|
||||
this.setUnlocalizedName("comb");
|
||||
@@ -41,7 +38,7 @@ public class ItemComb extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(int id, CreativeTabs tabs, List list)
|
||||
public void getSubItems(Item item, CreativeTabs tabs, List list)
|
||||
{
|
||||
for (CombType type : CombType.values())
|
||||
{
|
||||
@@ -66,17 +63,17 @@ public class ItemComb extends Item
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private Icon secondIcon;
|
||||
private IIcon secondIcon;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
this.itemIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":beeCombs.0");
|
||||
this.secondIcon= par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":beeCombs.1");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getIcon(ItemStack stack, int pass)
|
||||
public IIcon getIcon(ItemStack stack, int pass)
|
||||
{
|
||||
return (pass == 0) ? itemIcon : secondIcon;
|
||||
}
|
||||
@@ -97,7 +94,7 @@ public class ItemComb extends Item
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemDisplayName(ItemStack stack)
|
||||
public String getItemStackDisplayName(ItemStack stack)
|
||||
{
|
||||
return CombType.values()[stack.getItemDamage()].getName();
|
||||
}
|
||||
+14
-14
@@ -1,23 +1,23 @@
|
||||
package magicbees.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import magicbees.main.utils.TabMagicBees;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import magicbees.main.utils.TabMagicBees;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemCrystalAspect extends Item
|
||||
{
|
||||
public ItemCrystalAspect(int itemId)
|
||||
public ItemCrystalAspect()
|
||||
{
|
||||
super(itemId);
|
||||
super();
|
||||
this.setCreativeTab(TabMagicBees.tabMagicBees);
|
||||
this.setHasSubtypes(true);
|
||||
this.setUnlocalizedName("crystalAspect");
|
||||
@@ -26,7 +26,7 @@ public class ItemCrystalAspect extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(int par1, CreativeTabs tab, List list)
|
||||
public void getSubItems(Item item, CreativeTabs tab, List list)
|
||||
{
|
||||
/*for (EnumTag tag : EnumTag.values())
|
||||
{
|
||||
@@ -39,7 +39,7 @@ public class ItemCrystalAspect extends Item
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
this.itemIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":crystalAspect");
|
||||
}
|
||||
@@ -53,7 +53,7 @@ public class ItemCrystalAspect extends Item
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemDisplayName(ItemStack stack)
|
||||
public String getItemStackDisplayName(ItemStack stack)
|
||||
{
|
||||
return LocalizationManager.getLocalizedString("resource.crystalAspect");
|
||||
//return String.format(LocalizationManager.getLocalizedString("resource.crystalAspect"), EnumTag.get(stack.getItemDamage()).name);
|
||||
+11
-15
@@ -1,28 +1,24 @@
|
||||
package magicbees.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.Tabs;
|
||||
import magicbees.item.types.DropType;
|
||||
import magicbees.item.types.PropolisType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.MagicBees;
|
||||
import magicbees.main.utils.compat.ForestryHelper;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemDrop extends Item
|
||||
{
|
||||
public ItemDrop(int itemID)
|
||||
public ItemDrop()
|
||||
{
|
||||
super(itemID);
|
||||
super();
|
||||
this.setCreativeTab(Tabs.tabApiculture);
|
||||
this.setHasSubtypes(true);
|
||||
this.setUnlocalizedName("drop");
|
||||
@@ -41,7 +37,7 @@ public class ItemDrop extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(int id, CreativeTabs tabs, List list)
|
||||
public void getSubItems(Item item, CreativeTabs tabs, List list)
|
||||
{
|
||||
for (DropType type : DropType.values())
|
||||
{
|
||||
@@ -63,17 +59,17 @@ public class ItemDrop extends Item
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private Icon secondIcon;
|
||||
private IIcon secondIcon;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
this.itemIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":honeyDrop.0");
|
||||
this.secondIcon= par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":honeyDrop.1");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getIcon(ItemStack stack, int pass)
|
||||
public IIcon getIcon(ItemStack stack, int pass)
|
||||
{
|
||||
return (pass == 0) ? this.itemIcon : this.secondIcon;
|
||||
}
|
||||
@@ -94,7 +90,7 @@ public class ItemDrop extends Item
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemDisplayName(ItemStack stack)
|
||||
public String getItemStackDisplayName(ItemStack stack)
|
||||
{
|
||||
return DropType.values()[stack.getItemDamage()].getName();
|
||||
}
|
||||
+10
-10
@@ -1,12 +1,5 @@
|
||||
package magicbees.item;
|
||||
|
||||
import magicbees.item.types.HiveFrameType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.utils.TabMagicBees;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -14,14 +7,21 @@ import forestry.api.apiculture.IBee;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.apiculture.IHiveFrame;
|
||||
import magicbees.item.types.HiveFrameType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.utils.TabMagicBees;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class ItemMagicHiveFrame extends Item implements IHiveFrame
|
||||
{
|
||||
private HiveFrameType type;
|
||||
|
||||
public ItemMagicHiveFrame(int itemID, HiveFrameType frameType)
|
||||
public ItemMagicHiveFrame(HiveFrameType frameType)
|
||||
{
|
||||
super(itemID);
|
||||
super();
|
||||
this.type = frameType;
|
||||
this.setMaxDamage(this.type.maxDamage);
|
||||
this.setMaxStackSize(1);
|
||||
@@ -31,7 +31,7 @@ public class ItemMagicHiveFrame extends Item implements IHiveFrame
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
this.itemIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":frame" + type.getName());
|
||||
}
|
||||
+11
-15
@@ -1,30 +1,26 @@
|
||||
package magicbees.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.Tabs;
|
||||
import magicbees.item.types.ResourceType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.MagicBees;
|
||||
import magicbees.main.utils.TabMagicBees;
|
||||
import magicbees.main.utils.VersionInfo;
|
||||
import magicbees.main.utils.compat.ForestryHelper;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemMiscResources extends Item
|
||||
{
|
||||
private Icon[] icons = new Icon[ResourceType.values().length];
|
||||
private IIcon[] icons = new IIcon[ResourceType.values().length];
|
||||
|
||||
public ItemMiscResources(int ID)
|
||||
public ItemMiscResources()
|
||||
{
|
||||
super(ID);
|
||||
super();
|
||||
this.setCreativeTab(TabMagicBees.tabMagicBees);
|
||||
this.setHasSubtypes(true);
|
||||
this.setUnlocalizedName("miscResources");
|
||||
@@ -43,7 +39,7 @@ public class ItemMiscResources extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(int id, CreativeTabs tabs, List list)
|
||||
public void getSubItems(Item item, CreativeTabs tabs, List list)
|
||||
{
|
||||
for (ResourceType type : ResourceType.values())
|
||||
{
|
||||
@@ -55,7 +51,7 @@ public class ItemMiscResources extends Item
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
for (int i = 0; i < ResourceType.values().length; i++)
|
||||
{
|
||||
@@ -65,13 +61,13 @@ public class ItemMiscResources extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIconFromDamage(int meta)
|
||||
public IIcon getIconFromDamage(int meta)
|
||||
{
|
||||
return icons[meta];
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemDisplayName(ItemStack stack)
|
||||
public String getItemStackDisplayName(ItemStack stack)
|
||||
{
|
||||
return ResourceType.values()[stack.getItemDamage()].getLocalizedName();
|
||||
}
|
||||
+13
-13
@@ -1,37 +1,37 @@
|
||||
package magicbees.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.MagicBees;
|
||||
import magicbees.main.utils.MoonPhase;
|
||||
import magicbees.main.utils.TabMagicBees;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemMoonDial extends Item
|
||||
{
|
||||
@SideOnly(Side.CLIENT)
|
||||
private Icon[] icons;
|
||||
private IIcon[] icons;
|
||||
|
||||
public ItemMoonDial(int id)
|
||||
public ItemMoonDial()
|
||||
{
|
||||
super(id);
|
||||
super();
|
||||
this.setCreativeTab(TabMagicBees.tabMagicBees);
|
||||
this.setUnlocalizedName("moonDial");
|
||||
GameRegistry.registerItem(this, "moonDial");
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
this.icons = new Icon[MoonPhase.values().length];
|
||||
this.icons = new IIcon[MoonPhase.values().length];
|
||||
for (int i = 0; i < MoonPhase.values().length; ++i)
|
||||
{
|
||||
this.icons[i] = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":moonDial." + i);
|
||||
@@ -41,7 +41,7 @@ public class ItemMoonDial extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining)
|
||||
public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining)
|
||||
{
|
||||
return this.icons[MoonPhase.getMoonPhaseFromTime(player.worldObj.getWorldTime()).ordinal()];
|
||||
}
|
||||
+17
-16
@@ -1,39 +1,39 @@
|
||||
package magicbees.item;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import magicbees.main.utils.TabMagicBees;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.projectile.EntityArrow;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemMysteriousMagnet extends Item
|
||||
{
|
||||
@SideOnly(Side.CLIENT)
|
||||
private Icon activeIcon;
|
||||
private IIcon activeIcon;
|
||||
|
||||
private float rangeBase;
|
||||
private float multiplier;
|
||||
private int maxLevel;
|
||||
private final float fudgeFactor = 0.2f;
|
||||
|
||||
public ItemMysteriousMagnet(int par1)
|
||||
public ItemMysteriousMagnet()
|
||||
{
|
||||
super(par1);
|
||||
super();
|
||||
this.setNoRepair();
|
||||
this.setHasSubtypes(true);
|
||||
this.rangeBase = 3f;
|
||||
@@ -80,7 +80,7 @@ public class ItemMysteriousMagnet extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(int id, CreativeTabs tabs, List list)
|
||||
public void getSubItems(Item item, CreativeTabs tabs, List list)
|
||||
{
|
||||
for (int i = 0; i <= this.maxLevel; i++)
|
||||
{
|
||||
@@ -90,7 +90,7 @@ public class ItemMysteriousMagnet extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister iconRegister)
|
||||
public void registerIcons(IIconRegister iconRegister)
|
||||
{
|
||||
this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":magnetInactive");
|
||||
this.activeIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":magnetActive");
|
||||
@@ -98,7 +98,7 @@ public class ItemMysteriousMagnet extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIconFromDamage(int damage)
|
||||
public IIcon getIconFromDamage(int damage)
|
||||
{
|
||||
return isMagnetActive(damage) ? this.activeIcon : this.itemIcon;
|
||||
}
|
||||
@@ -126,7 +126,7 @@ public class ItemMysteriousMagnet extends Item
|
||||
if (isMagnetActive(itemStack) && entity instanceof EntityPlayer)
|
||||
{
|
||||
EntityPlayer player = (EntityPlayer)entity;
|
||||
int dragCount = player.username.hashCode();
|
||||
int dragCount = player.getCommandSenderName().hashCode();
|
||||
float radius = getRadius(itemStack.getItemDamage()) - fudgeFactor;
|
||||
AxisAlignedBB bounds = player.boundingBox.expand(radius, radius, radius);
|
||||
|
||||
@@ -142,7 +142,8 @@ public class ItemMysteriousMagnet extends Item
|
||||
{
|
||||
if (arrow.canBePickedUp == 1 && world.rand.nextInt(6) == 0)
|
||||
{
|
||||
EntityItem replacement = new EntityItem(world, arrow.posX, arrow.posY, arrow.posZ, new ItemStack(Item.arrow));
|
||||
EntityItem replacement = new EntityItem(world, arrow.posX, arrow.posY, arrow.posZ,
|
||||
new ItemStack(Items.arrow));
|
||||
world.spawnEntityInWorld(replacement);
|
||||
}
|
||||
world.removeEntity(arrow);
|
||||
+15
-15
@@ -1,25 +1,25 @@
|
||||
package magicbees.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import magicbees.item.types.NuggetType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemNugget extends Item
|
||||
{
|
||||
@SideOnly(Side.CLIENT)
|
||||
private Icon[] icons;
|
||||
private IIcon[] icons;
|
||||
|
||||
public ItemNugget(int itemID)
|
||||
public ItemNugget()
|
||||
{
|
||||
super(itemID);
|
||||
super();
|
||||
this.setCreativeTab(CreativeTabs.tabMaterials);
|
||||
this.setHasSubtypes(true);
|
||||
this.setUnlocalizedName("beeNugget");
|
||||
@@ -37,21 +37,21 @@ public class ItemNugget extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(int par1, CreativeTabs tab, List list)
|
||||
public void getSubItems(Item item, CreativeTabs tab, List list)
|
||||
{
|
||||
for (NuggetType type : NuggetType.values())
|
||||
{
|
||||
if (type.isActive())
|
||||
{
|
||||
list.add(new ItemStack(this.itemID, 1, type.ordinal()));
|
||||
list.add(new ItemStack(item, 1, type.ordinal()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
this.icons = new Icon[NuggetType.values().length];
|
||||
this.icons = new IIcon[NuggetType.values().length];
|
||||
for (int i = 0; i < NuggetType.values().length; i++)
|
||||
{
|
||||
this.icons[i] = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":nugget"
|
||||
@@ -62,13 +62,13 @@ public class ItemNugget extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIconFromDamage(int meta)
|
||||
public IIcon getIconFromDamage(int meta)
|
||||
{
|
||||
return icons[meta];
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemDisplayName(ItemStack stack)
|
||||
public String getItemStackDisplayName(ItemStack stack)
|
||||
{
|
||||
return NuggetType.values()[stack.getItemDamage()].getName();
|
||||
}
|
||||
+11
-13
@@ -1,26 +1,24 @@
|
||||
package magicbees.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.Tabs;
|
||||
import magicbees.item.types.PollenType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.MagicBees;
|
||||
import magicbees.main.utils.compat.ForestryHelper;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemPollen extends Item
|
||||
{
|
||||
public ItemPollen(int itemID)
|
||||
public ItemPollen()
|
||||
{
|
||||
super(itemID);
|
||||
super();
|
||||
this.setCreativeTab(Tabs.tabApiculture);
|
||||
this.setHasSubtypes(true);
|
||||
this.setUnlocalizedName("pollen");
|
||||
@@ -38,7 +36,7 @@ public class ItemPollen extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(int id, CreativeTabs tabs, List list)
|
||||
public void getSubItems(Item item, CreativeTabs tabs, List list)
|
||||
{
|
||||
for (PollenType type : PollenType.values())
|
||||
{
|
||||
@@ -60,17 +58,17 @@ public class ItemPollen extends Item
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private Icon secondIcon;
|
||||
private IIcon secondIcon;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
this.itemIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":pollen.0");
|
||||
this.secondIcon= par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":pollen.1");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getIcon(ItemStack stack, int pass)
|
||||
public IIcon getIcon(ItemStack stack, int pass)
|
||||
{
|
||||
return (pass == 0) ? this.itemIcon : this.secondIcon;
|
||||
}
|
||||
@@ -91,7 +89,7 @@ public class ItemPollen extends Item
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemDisplayName(ItemStack stack)
|
||||
public String getItemStackDisplayName(ItemStack stack)
|
||||
{
|
||||
return PollenType.values()[stack.getItemDamage()].getName();
|
||||
}
|
||||
+8
-10
@@ -1,25 +1,23 @@
|
||||
package magicbees.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.Tabs;
|
||||
import magicbees.item.types.PropolisType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.utils.compat.ForestryHelper;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemPropolis extends Item
|
||||
{
|
||||
public ItemPropolis(int id)
|
||||
public ItemPropolis()
|
||||
{
|
||||
super(id);
|
||||
super();
|
||||
this.setCreativeTab(Tabs.tabApiculture);
|
||||
this.setHasSubtypes(true);
|
||||
this.setUnlocalizedName("propolis");
|
||||
@@ -38,7 +36,7 @@ public class ItemPropolis extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(int id, CreativeTabs tabs, List list)
|
||||
public void getSubItems(Item item, CreativeTabs tabs, List list)
|
||||
{
|
||||
for (PropolisType type : PropolisType.values())
|
||||
{
|
||||
@@ -47,7 +45,7 @@ public class ItemPropolis extends Item
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
this.itemIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":propolis.0");
|
||||
}
|
||||
@@ -65,7 +63,7 @@ public class ItemPropolis extends Item
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemDisplayName(ItemStack stack)
|
||||
public String getItemStackDisplayName(ItemStack stack)
|
||||
{
|
||||
return PropolisType.values()[stack.getItemDamage()].getName();
|
||||
}
|
||||
+25
-9
@@ -15,11 +15,14 @@ import thaumcraft.api.IRepairableExtended;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import forestry.api.arboriculture.IToolGrafter;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IToolGrafter
|
||||
{
|
||||
public ItemThaumiumGrafter(int id)
|
||||
public ItemThaumiumGrafter()
|
||||
{
|
||||
super(id);
|
||||
super();
|
||||
this.setMaxStackSize(1);
|
||||
this.setMaxDamage(15);
|
||||
this.setCreativeTab(forestry.api.core.Tabs.tabArboriculture);
|
||||
@@ -31,25 +34,37 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
|
||||
{
|
||||
return 100f;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<String> getToolClasses(ItemStack itemStack) {
|
||||
HashSet<String> classes = new HashSet<String>(1);
|
||||
classes.add("grafter");
|
||||
return classes;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getHarvestLevel(ItemStack itemStack, String toolClass) {
|
||||
return toolClass.equals("grafter") ? 3 : 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getStrVsBlock(ItemStack itemStack, Block block)
|
||||
public float func_150893_a(ItemStack itemStack, Block block)
|
||||
{
|
||||
return 1f;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getStrVsBlock(ItemStack itemStack, Block block, int metadata)
|
||||
public float getDigSpeed(ItemStack itemStack, Block block, int metadata)
|
||||
{
|
||||
return ForgeHooks.isToolEffective(itemStack, block, metadata) ? 4.8f : getStrVsBlock(itemStack, block);
|
||||
return ForgeHooks.isToolEffective(itemStack, block, metadata) ? 4.8f : func_150893_a(itemStack, block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(ItemStack itemstack, World world, int id, int x, int y, int z, EntityLivingBase entityLiving) {
|
||||
public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z,
|
||||
EntityLivingBase entityLiving) {
|
||||
int damage = 1;
|
||||
if (id == Config.tcLeaf.blockID)
|
||||
if (block == Config.tcLeaf)
|
||||
{
|
||||
Block block = Block.blocksList[id];
|
||||
int meta = world.getBlockMetadata(x, y, z) & 1;
|
||||
if (meta == 0 || meta == 1)
|
||||
{
|
||||
@@ -95,7 +110,8 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
|
||||
*/
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
|
||||
{
|
||||
return ThaumcraftApi.toolMatThaumium.getToolCraftingMaterial() == par2ItemStack.itemID ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
return ThaumcraftApi.toolMatThaumium.customCraftingMaterial == par2ItemStack.getItem() ? true : super.getIsRepairable
|
||||
(par1ItemStack, par2ItemStack);
|
||||
}
|
||||
|
||||
@Override
|
||||
+24
-7
@@ -11,11 +11,14 @@ import thaumcraft.api.IRepairable;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import forestry.api.core.IToolScoop;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
|
||||
{
|
||||
public ItemThaumiumScoop(int itemID)
|
||||
public ItemThaumiumScoop()
|
||||
{
|
||||
super(itemID);
|
||||
super();
|
||||
this.setMaxStackSize(1);
|
||||
this.setMaxDamage(30);
|
||||
this.setCreativeTab(forestry.api.core.Tabs.tabApiculture);
|
||||
@@ -23,19 +26,32 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getStrVsBlock(ItemStack itemStack, Block block)
|
||||
public Set<String> getToolClasses(ItemStack itemStack) {
|
||||
HashSet<String> classes = new HashSet<String>(1);
|
||||
classes.add("scoop");
|
||||
return classes;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getHarvestLevel(ItemStack itemStack, String toolClass) {
|
||||
return toolClass.equals("scoop") ? 3 : 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float func_150893_a(ItemStack itemStack, Block block)
|
||||
{
|
||||
return 1f;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getStrVsBlock(ItemStack itemStack, Block block, int metadata)
|
||||
public float getDigSpeed(ItemStack itemStack, Block block, int metadata)
|
||||
{
|
||||
return ForgeHooks.isToolEffective(itemStack, block, metadata) ? 4.8f : getStrVsBlock(itemStack, block);
|
||||
return ForgeHooks.isToolEffective(itemStack, block, metadata) ? 4.8f : func_150893_a(itemStack, block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(ItemStack itemstack, World world, int i, int j, int k, int l, EntityLivingBase entityliving) {
|
||||
public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int j, int k, int l,
|
||||
EntityLivingBase entityliving) {
|
||||
itemstack.damageItem(1, entityliving);
|
||||
return true;
|
||||
}
|
||||
@@ -61,6 +77,7 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
|
||||
*/
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
|
||||
{
|
||||
return ThaumcraftApi.toolMatThaumium.getToolCraftingMaterial() == par2ItemStack.itemID ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
return ThaumcraftApi.toolMatThaumium.customCraftingMaterial == par2ItemStack.getItem() ? true : super
|
||||
.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
}
|
||||
}
|
||||
+16
-16
@@ -1,27 +1,27 @@
|
||||
package magicbees.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import magicbees.item.types.WaxType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.Tabs;
|
||||
import magicbees.item.types.WaxType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemWax extends Item
|
||||
{
|
||||
@SideOnly(Side.CLIENT)
|
||||
private Icon secondaryIcon;
|
||||
private IIcon secondaryIcon;
|
||||
|
||||
public ItemWax(int itemID)
|
||||
public ItemWax()
|
||||
{
|
||||
super(itemID);
|
||||
super();
|
||||
this.setCreativeTab(Tabs.tabApiculture);
|
||||
this.setHasSubtypes(true);
|
||||
this.setUnlocalizedName("wax");
|
||||
@@ -39,7 +39,7 @@ public class ItemWax extends Item
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister par1IconRegister)
|
||||
public void registerIcons(IIconRegister par1IconRegister)
|
||||
{
|
||||
this.itemIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":wax.0");
|
||||
this.secondaryIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":wax.1");
|
||||
@@ -47,14 +47,14 @@ public class ItemWax extends Item
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIconFromDamage(int meta)
|
||||
public IIcon getIconFromDamage(int meta)
|
||||
{
|
||||
return (WaxType.values()[meta].sparkly) ? this.itemIcon : this.secondaryIcon;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(int id, CreativeTabs tabs, List list)
|
||||
public void getSubItems(Item item, CreativeTabs tabs, List list)
|
||||
{
|
||||
for (WaxType type : WaxType.values())
|
||||
{
|
||||
@@ -76,7 +76,7 @@ public class ItemWax extends Item
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemDisplayName(ItemStack stack)
|
||||
public String getItemStackDisplayName(ItemStack stack)
|
||||
{
|
||||
return WaxType.values()[stack.getItemDamage()].getName();
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
+2
-4
@@ -1,9 +1,7 @@
|
||||
package magicbees.item.types;
|
||||
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraftforge.liquids.LiquidDictionary;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
public enum FluidType
|
||||
{
|
||||
@@ -44,7 +42,7 @@ public enum FluidType
|
||||
public String liquidID;
|
||||
public int iconIdx;
|
||||
public boolean available = false;
|
||||
public Icon liquidIcon;
|
||||
public IIcon liquidIcon;
|
||||
|
||||
private FluidType(String l)
|
||||
{
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+2
-1
@@ -4,6 +4,7 @@ import magicbees.client.render.EffectJarRenderer;
|
||||
import magicbees.tileentity.TileEntityEffectJar;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||
@@ -19,7 +20,7 @@ public class ClientProxy extends CommonProxy
|
||||
super.registerRenderers();
|
||||
|
||||
RenderIdEffectJar = RenderingRegistry.getNextAvailableRenderId();
|
||||
MinecraftForgeClient.registerItemRenderer(Config.effectJar.blockID, EffectJarRenderer.instance);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Config.effectJar), EffectJarRenderer.instance);
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEffectJar.class, EffectJarRenderer.instance);
|
||||
}
|
||||
}
|
||||
File renamed without changes.
+76
-111
@@ -1,31 +1,20 @@
|
||||
package magicbees.main;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.storage.BackpackManager;
|
||||
import forestry.api.storage.EnumBackpackType;
|
||||
import forestry.api.storage.IBackpackDefinition;
|
||||
import magicbees.block.BlockEffectJar;
|
||||
import magicbees.block.BlockHive;
|
||||
import magicbees.block.BlockPlanks;
|
||||
import magicbees.block.BlockWoodSlab;
|
||||
import magicbees.block.types.HiveType;
|
||||
import magicbees.item.ItemCapsule;
|
||||
import magicbees.item.ItemComb;
|
||||
import magicbees.item.ItemCrystalAspect;
|
||||
import magicbees.item.ItemDrop;
|
||||
import magicbees.item.ItemMagicHiveFrame;
|
||||
import magicbees.item.ItemMiscResources;
|
||||
import magicbees.item.ItemMoonDial;
|
||||
import magicbees.item.ItemMysteriousMagnet;
|
||||
import magicbees.item.ItemNugget;
|
||||
import magicbees.item.ItemPollen;
|
||||
import magicbees.item.ItemPropolis;
|
||||
import magicbees.item.ItemWax;
|
||||
import magicbees.item.types.CapsuleType;
|
||||
import magicbees.item.types.HiveFrameType;
|
||||
import magicbees.item.types.NuggetType;
|
||||
import magicbees.item.types.ResourceType;
|
||||
import magicbees.item.types.WaxType;
|
||||
import magicbees.block.types.PlankType;
|
||||
import magicbees.item.*;
|
||||
import magicbees.item.types.*;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import magicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import magicbees.storage.BackpackDefinition;
|
||||
@@ -33,23 +22,20 @@ import magicbees.tileentity.TileEntityEffectJar;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemFood;
|
||||
import net.minecraft.item.ItemMultiTextureTile;
|
||||
import net.minecraft.item.ItemMultiTexture;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.util.WeightedRandomChestContent;
|
||||
import net.minecraftforge.common.ChestGenHooks;
|
||||
import net.minecraftforge.common.Configuration;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.Property;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
import net.minecraftforge.common.config.Property;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.storage.BackpackManager;
|
||||
import forestry.api.storage.EnumBackpackType;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
/**
|
||||
* A class to hold some data related to mod state & functions.
|
||||
@@ -204,74 +190,67 @@ public class Config
|
||||
|
||||
public void setupBlocks()
|
||||
{
|
||||
int blockIdBase = 1750;
|
||||
|
||||
{
|
||||
int plankId = configuration.getBlock("planksTC", blockIdBase++).getInt();
|
||||
int slabFullId = configuration.getBlock("slabFull", blockIdBase++).getInt();
|
||||
int slabHalfId = configuration.getBlock("slabHalf", blockIdBase++).getInt();
|
||||
|
||||
/*if (ThaumcraftHelper.isActive())
|
||||
if (ThaumcraftHelper.isActive())
|
||||
{
|
||||
planksWood = new BlockPlanks(plankId);
|
||||
planksWood.setUnlocalizedName("planks");
|
||||
planksWood = new BlockPlanks();
|
||||
planksWood.setBlockName("planks");
|
||||
|
||||
Item.itemsList[planksWood.blockID] = null;
|
||||
Item.itemsList[planksWood.blockID] = new ItemMultiTextureTile(planksWood.blockID - 256, planksWood, PlankType.getAllNames());
|
||||
//Item.itemsList[planksWood.blockID] = null;
|
||||
//Item.itemsList[planksWood.blockID] = new ItemMultiTexture(planksWood.blockID - 256, planksWood,
|
||||
// PlankType.getAllNames());
|
||||
|
||||
FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", MagicBees.getConfig().planksWood.blockID + "@" + PlankType.GREATWOOD.ordinal());
|
||||
FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", MagicBees.getConfig().planksWood.blockID + "@" + PlankType.SILVERWOOD.ordinal());
|
||||
|
||||
slabWoodFull = new BlockWoodSlab(slabFullId, true);
|
||||
slabWoodHalf = new BlockWoodSlab(slabHalfId, false);
|
||||
|
||||
slabWoodFull.setUnlocalizedName("planks");
|
||||
slabWoodHalf.setUnlocalizedName("planks");
|
||||
//FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", MagicBees.getConfig().planksWood
|
||||
// .blockID + "@" + PlankType.GREATWOOD.ordinal());
|
||||
//FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", MagicBees.getConfig().planksWood
|
||||
// .blockID + "@" + PlankType.SILVERWOOD.ordinal());
|
||||
|
||||
Item.itemsList[slabWoodHalf.blockID] = null;
|
||||
slabWoodFull = new BlockWoodSlab(true);
|
||||
slabWoodHalf = new BlockWoodSlab(false);
|
||||
|
||||
slabWoodFull.setBlockName("planks");
|
||||
slabWoodHalf.setBlockName("planks");
|
||||
|
||||
/*Item.itemsList[slabWoodHalf.blockID] = null;
|
||||
Item.itemsList[slabWoodHalf.blockID] = new ItemSlab(slabWoodHalf.blockID - 256, slabWoodHalf, slabWoodFull, false);
|
||||
Item.itemsList[slabWoodFull.blockID] = null;
|
||||
Item.itemsList[slabWoodFull.blockID] = new ItemSlab(slabWoodFull.blockID - 256, slabWoodHalf, slabWoodFull, true);
|
||||
|
||||
Item.itemsList[slabWoodFull.blockID] = new ItemSlab(slabWoodFull.blockID - 256, slabWoodHalf,
|
||||
slabWoodFull, true);*/
|
||||
|
||||
OreDictionary.registerOre("plankWood", new ItemStack(planksWood, 1, -1));
|
||||
OreDictionary.registerOre("slabWood", new ItemStack(slabWoodHalf, 1, -1));
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
effectJar = new BlockEffectJar(configuration.getBlock("effectJar", blockIdBase++).getInt());
|
||||
|
||||
effectJar = new BlockEffectJar();
|
||||
GameRegistry.registerBlock(effectJar, "effectJar");
|
||||
GameRegistry.registerTileEntity(TileEntityEffectJar.class, TileEntityEffectJar.tileEntityName);
|
||||
|
||||
hive = new BlockHive(configuration.getBlock("hives", blockIdBase++).getInt());
|
||||
|
||||
hive = new BlockHive();
|
||||
GameRegistry.registerBlock(hive, "hive");
|
||||
|
||||
|
||||
for (HiveType t : HiveType.values())
|
||||
{
|
||||
MinecraftForge.setBlockHarvestLevel(hive, t.ordinal(), "scoop", 0);
|
||||
hive.setHarvestLevel("scoop", t.ordinal(), 0);
|
||||
}
|
||||
|
||||
|
||||
FMLLog.info("Replacing stupid-block with 'Here, have some delicious textures' ItemBlock. This is 100%% normal.");
|
||||
Item.itemsList[hive.blockID] = null;
|
||||
Item.itemsList[hive.blockID] = new ItemMultiTextureTile(hive.blockID - 256, hive, HiveType.getAllNames());
|
||||
/*Item.itemsList[hive.blockID] = null;
|
||||
Item.itemsList[hive.blockID] = new ItemMultiTextureTile(hive.blockID - 256, hive, HiveType.getAllNames());*/
|
||||
}
|
||||
|
||||
public void setupItems()
|
||||
{
|
||||
int itemIDBase = 26090;
|
||||
|
||||
combs= new ItemComb(configuration.getItem("combs", itemIDBase++).getInt() - 256);
|
||||
wax = new ItemWax(configuration.getItem("wax", itemIDBase++).getInt() - 256);
|
||||
propolis = new ItemPropolis(configuration.getItem("propolis", itemIDBase++).getInt() - 256);
|
||||
drops = new ItemDrop(configuration.getItem("drop", itemIDBase++).getInt() - 256);
|
||||
miscResources = new ItemMiscResources(configuration.getItem("miscResources", itemIDBase++).getInt() - 256);
|
||||
combs = new ItemComb();
|
||||
wax = new ItemWax();
|
||||
propolis = new ItemPropolis();
|
||||
drops = new ItemDrop();
|
||||
miscResources = new ItemMiscResources();
|
||||
|
||||
// Make Aromatic Lumps a swarmer inducer. Chance is /1000.
|
||||
BeeManager.inducers.put(miscResources.getStackForType(ResourceType.AROMATIC_LUMP), 95);
|
||||
|
||||
{
|
||||
int tier1 = configuration.getItem("thaumaturgePack1", itemIDBase++).getInt() - 256;
|
||||
int tier2 = configuration.getItem("thaumaturgePack2", itemIDBase++).getInt() - 256;
|
||||
|
||||
if (ThaumcraftHelper.isActive())
|
||||
{
|
||||
try
|
||||
@@ -279,9 +258,9 @@ public class Config
|
||||
// 0x8700C6 = purpleish.
|
||||
String backpackName = LocalizationManager.getLocalizedString("backpack.thaumaturge");
|
||||
BackpackDefinition def = new BackpackDefinition("thaumaturge", backpackName, 0x8700C6);
|
||||
thaumaturgeBackpackT1 = BackpackManager.backpackInterface.addBackpack(tier1, def, EnumBackpackType.T1);
|
||||
thaumaturgeBackpackT1 = BackpackManager.backpackInterface.addBackpack(def, EnumBackpackType.T1);
|
||||
thaumaturgeBackpackT1.setUnlocalizedName("backpack.thaumaturgeT1");
|
||||
thaumaturgeBackpackT2 = BackpackManager.backpackInterface.addBackpack(tier2, def, EnumBackpackType.T2);
|
||||
thaumaturgeBackpackT2 = BackpackManager.backpackInterface.addBackpack(def, EnumBackpackType.T2);
|
||||
thaumaturgeBackpackT2.setUnlocalizedName("backpack.thaumaturgeT2");
|
||||
// Add additional items from configs to backpack.
|
||||
if (MagicBees.getConfig().ThaumaturgeExtraItems.length() > 0)
|
||||
@@ -297,71 +276,57 @@ public class Config
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
magicCapsule = new ItemCapsule(CapsuleType.MAGIC, configuration.getItem("magicCapsule", itemIDBase++).getInt() - 256, this.CapsuleStackSizeMax);
|
||||
pollen = new ItemPollen(configuration.getItem("pollen", itemIDBase++).getInt() - 256);
|
||||
|
||||
magicCapsule = new ItemCapsule(CapsuleType.MAGIC, this.CapsuleStackSizeMax);
|
||||
pollen = new ItemPollen();
|
||||
|
||||
{
|
||||
int crystalId = configuration.getItem("fluxCrystal", itemIDBase++).getInt() - 256;
|
||||
/*if (ThaumcraftHelper.isActive())
|
||||
if (ThaumcraftHelper.isActive())
|
||||
{
|
||||
solidFlux = new ItemCrystalAspect(crystalId);
|
||||
}*/
|
||||
solidFlux = new ItemCrystalAspect();
|
||||
}
|
||||
}
|
||||
|
||||
hiveFrameMagic = new ItemMagicHiveFrame(configuration.getItem("frameMagic", itemIDBase++).getInt() - 256, HiveFrameType.MAGIC);
|
||||
hiveFrameResilient = new ItemMagicHiveFrame(configuration.getItem("frameResilient", itemIDBase++).getInt() - 256, HiveFrameType.RESILIENT);
|
||||
hiveFrameGentle = new ItemMagicHiveFrame(configuration.getItem("frameGentle", itemIDBase++).getInt() - 256, HiveFrameType.GENTLE);
|
||||
hiveFrameMetabolic = new ItemMagicHiveFrame(configuration.getItem("frameMetabolic", itemIDBase++).getInt() - 256, HiveFrameType.METABOLIC);
|
||||
hiveFrameNecrotic = new ItemMagicHiveFrame(configuration.getItem("frameNecrotic", itemIDBase++).getInt() - 256, HiveFrameType.NECROTIC);
|
||||
hiveFrameTemporal = new ItemMagicHiveFrame(configuration.getItem("frameTemporal", itemIDBase++).getInt() - 256, HiveFrameType.TEMPORAL);
|
||||
hiveFrameOblivion = new ItemMagicHiveFrame(configuration.getItem("frameOblivion", itemIDBase++).getInt() - 256, HiveFrameType.OBLIVION);
|
||||
// Future frames, so they all are clumped together.
|
||||
itemIDBase++;
|
||||
itemIDBase++;
|
||||
itemIDBase++;
|
||||
itemIDBase++;
|
||||
itemIDBase++;
|
||||
itemIDBase++;
|
||||
itemIDBase++;
|
||||
itemIDBase++;
|
||||
hiveFrameMagic = new ItemMagicHiveFrame(HiveFrameType.MAGIC);
|
||||
hiveFrameResilient = new ItemMagicHiveFrame(HiveFrameType.RESILIENT);
|
||||
hiveFrameGentle = new ItemMagicHiveFrame(HiveFrameType.GENTLE);
|
||||
hiveFrameMetabolic = new ItemMagicHiveFrame(HiveFrameType.METABOLIC);
|
||||
hiveFrameNecrotic = new ItemMagicHiveFrame(HiveFrameType.NECROTIC);
|
||||
hiveFrameTemporal = new ItemMagicHiveFrame(HiveFrameType.TEMPORAL);
|
||||
hiveFrameOblivion = new ItemMagicHiveFrame(HiveFrameType.OBLIVION);
|
||||
|
||||
ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameOblivion), 1, 1, 18));
|
||||
ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameOblivion), 1, 3, 23));
|
||||
|
||||
jellyBaby = new ItemFood(configuration.getItem("jellyBabies", itemIDBase++).getInt() - 256, 1, false).setAlwaysEdible()
|
||||
jellyBaby = new ItemFood(1, false).setAlwaysEdible()
|
||||
.setPotionEffect(Potion.moveSpeed.id, 5, 1, 1f);
|
||||
jellyBaby.setUnlocalizedName(CommonProxy.DOMAIN + ":jellyBabies").setTextureName(CommonProxy.DOMAIN + ":jellyBabies");
|
||||
GameRegistry.registerItem(jellyBaby, CommonProxy.DOMAIN + ":jellyBabies");
|
||||
|
||||
|
||||
voidCapsule = new ItemCapsule(CapsuleType.VOID, configuration.getItem("voidCapsule", itemIDBase++).getInt() - 256, this.CapsuleStackSizeMax);
|
||||
voidCapsule = new ItemCapsule(CapsuleType.VOID, this.CapsuleStackSizeMax);
|
||||
|
||||
{
|
||||
int scoopID = configuration.getItem("thaumiumScoop", itemIDBase++).getInt() - 256;
|
||||
int grafterID = configuration.getItem("thaumiumGrafter", itemIDBase++).getInt() - 256;
|
||||
if (ThaumcraftHelper.isActive())
|
||||
{
|
||||
try {
|
||||
// Reflecting avoids the need to directly include the Thaumcraft API in the jar. BAM!
|
||||
Constructor ctor1 = Class.forName("magicbees.item.ItemThaumiumScoop").getConstructor(int.class);
|
||||
thaumiumScoop = (Item)ctor1.newInstance(scoopID);
|
||||
MinecraftForge.setToolClass(thaumiumScoop, "scoop", 3);
|
||||
Constructor ctor1 = Class.forName("magicbees.item.ItemThaumiumScoop").getConstructor();
|
||||
thaumiumScoop = (Item)ctor1.newInstance();
|
||||
GameRegistry.registerItem(thaumiumScoop, thaumiumScoop.getUnlocalizedName());
|
||||
|
||||
Constructor ctor2 = Class.forName("magicbees.item.ItemThaumiumGrafter").getConstructor(int.class);
|
||||
thaumiumGrafter = (Item)ctor2.newInstance(grafterID);
|
||||
MinecraftForge.setToolClass(thaumiumGrafter, "grafter", 3);
|
||||
Constructor ctor2 = Class.forName("magicbees.item.ItemThaumiumGrafter").getConstructor();
|
||||
thaumiumGrafter = (Item)ctor2.newInstance();
|
||||
GameRegistry.registerItem(thaumiumGrafter, thaumiumGrafter.getUnlocalizedName());
|
||||
} catch (Exception e) { }
|
||||
}
|
||||
}
|
||||
|
||||
moonDial = new ItemMoonDial(configuration.getItem("moonDial", itemIDBase++).getInt() - 256);
|
||||
moonDial = new ItemMoonDial();
|
||||
|
||||
nuggets = new ItemNugget(configuration.getItem("beeNuggets", itemIDBase++).getInt() - 256);
|
||||
nuggets = new ItemNugget();
|
||||
|
||||
magnet = new ItemMysteriousMagnet(configuration.getItem("magicMagnet", itemIDBase++).getInt() - 256);
|
||||
magnet = new ItemMysteriousMagnet();
|
||||
magnet.setBaseRange(MagnetBaseRange);
|
||||
magnet.setLevelMultiplier(MagnetLevelMultiplier);
|
||||
magnet.setMaximumLevel(MagnetMaxLevel);
|
||||
+13
-24
@@ -1,5 +1,13 @@
|
||||
package magicbees.main;
|
||||
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.SidedProxy;
|
||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
|
||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import magicbees.bees.BeeManager;
|
||||
import magicbees.bees.TransmutationEffectController;
|
||||
import magicbees.client.gui.GUIHandler;
|
||||
@@ -7,33 +15,13 @@ import magicbees.main.utils.CraftingManager;
|
||||
import magicbees.main.utils.IMCManager;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import magicbees.main.utils.VersionInfo;
|
||||
import magicbees.main.utils.compat.ArsMagicaHelper;
|
||||
import magicbees.main.utils.compat.EquivalentExchangeHelper;
|
||||
import magicbees.main.utils.compat.ExtraBeesHelper;
|
||||
import magicbees.main.utils.compat.ForestryHelper;
|
||||
import magicbees.main.utils.compat.RedstoneArsenalHelper;
|
||||
import magicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import magicbees.main.utils.compat.ThermalExpansionHelper;
|
||||
import magicbees.main.utils.compat.*;
|
||||
import magicbees.world.WorldGeneratorHandler;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.SidedProxy;
|
||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
|
||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
import cpw.mods.fml.common.network.NetworkMod;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
@Mod(
|
||||
modid=VersionInfo.ModName,
|
||||
name="Magic Bees",
|
||||
useMetadata=true,
|
||||
acceptedMinecraftVersions=VersionInfo.MCVersion,
|
||||
version=VersionInfo.Version,
|
||||
dependencies=VersionInfo.Depends
|
||||
)
|
||||
@NetworkMod(serverSideRequired=false, clientSideRequired=true)
|
||||
public class MagicBees
|
||||
{
|
||||
|
||||
@@ -81,8 +69,9 @@ public class MagicBees
|
||||
ArsMagicaHelper.init();
|
||||
ThermalExpansionHelper.init();
|
||||
RedstoneArsenalHelper.init();
|
||||
|
||||
GameRegistry.registerWorldGenerator(worldHandler = new WorldGeneratorHandler());
|
||||
|
||||
worldHandler = new WorldGeneratorHandler();
|
||||
GameRegistry.registerWorldGenerator(worldHandler, 0);
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
@@ -97,7 +86,7 @@ public class MagicBees
|
||||
RedstoneArsenalHelper.postInit();
|
||||
|
||||
this.guiHandler = new GUIHandler();
|
||||
NetworkRegistry.instance().registerGuiHandler(this, this.guiHandler);
|
||||
NetworkRegistry.INSTANCE.registerGuiHandler(this, this.guiHandler);
|
||||
|
||||
proxy.registerRenderers();
|
||||
|
||||
File renamed without changes.
+149
-140
@@ -1,32 +1,24 @@
|
||||
package magicbees.main.utils;
|
||||
|
||||
import magicbees.block.types.PlankType;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import forestry.api.core.BlockInterface;
|
||||
import forestry.api.core.ItemInterface;
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
import magicbees.item.ItemCapsule;
|
||||
import magicbees.item.types.CombType;
|
||||
import magicbees.item.types.DropType;
|
||||
import magicbees.item.types.FluidType;
|
||||
import magicbees.item.types.NuggetType;
|
||||
import magicbees.item.types.PollenType;
|
||||
import magicbees.item.types.PropolisType;
|
||||
import magicbees.item.types.ResourceType;
|
||||
import magicbees.item.types.WaxType;
|
||||
import magicbees.item.types.*;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.utils.compat.ArsMagicaHelper;
|
||||
import magicbees.main.utils.compat.ForestryHelper;
|
||||
import magicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import magicbees.main.utils.compat.ThermalExpansionHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import forestry.api.core.BlockInterface;
|
||||
import forestry.api.core.ItemInterface;
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
|
||||
public class CraftingManager
|
||||
{
|
||||
@@ -63,12 +55,12 @@ public class CraftingManager
|
||||
GameRegistry.addRecipe(output, new Object[] {
|
||||
" S ", " F ", " S ",
|
||||
'F', input,
|
||||
'S', Block.sand
|
||||
'S', Blocks.sand
|
||||
});
|
||||
GameRegistry.addRecipe(output, new Object[] {
|
||||
" ", "SFS", " ",
|
||||
'F', input,
|
||||
'S', Block.sand
|
||||
'S', Blocks.sand
|
||||
});
|
||||
|
||||
output = output.copy();
|
||||
@@ -78,24 +70,24 @@ public class CraftingManager
|
||||
'F', input,
|
||||
'a', ItemInterface.getItem("ash")
|
||||
});
|
||||
|
||||
|
||||
// "bottling" Intellect drops
|
||||
GameRegistry.addRecipe(new ItemStack(Item.expBottle), new Object[] {
|
||||
GameRegistry.addRecipe(new ItemStack(Items.experience_bottle), new Object[] {
|
||||
"DDD", "DBD", "DDD",
|
||||
'D', Config.drops.getStackForType(DropType.INTELLECT),
|
||||
'B', Item.glassBottle
|
||||
'B', Items.glass_bottle
|
||||
});
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(Block.slowSand, 4), new Object[] {
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(Blocks.soul_sand, 4), new Object[] {
|
||||
"SwS", "wDw", "SwS",
|
||||
'S', Block.sand,
|
||||
'D', Block.dirt,
|
||||
'S', Blocks.sand,
|
||||
'D', Blocks.dirt,
|
||||
'w', Config.wax.getStackForType(WaxType.SOUL)
|
||||
});
|
||||
GameRegistry.addRecipe(new ItemStack(Block.slowSand, 4), new Object[] {
|
||||
GameRegistry.addRecipe(new ItemStack(Blocks.soul_sand, 4), new Object[] {
|
||||
"wSw", "SDS", "wSw",
|
||||
'S', Block.sand,
|
||||
'D', Block.dirt,
|
||||
'S', Blocks.sand,
|
||||
'D', Blocks.dirt,
|
||||
'w', Config.wax.getStackForType(WaxType.SOUL)
|
||||
});
|
||||
|
||||
@@ -106,45 +98,45 @@ public class CraftingManager
|
||||
'w', Config.wax.getStackForType(WaxType.MAGIC),
|
||||
'f', input
|
||||
});
|
||||
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(Config.hiveFrameTemporal), new Object[] {
|
||||
"sPs", "PfP", "sPs",
|
||||
's', Block.sand,
|
||||
's', Blocks.sand,
|
||||
'P', Config.pollen.getStackForType(PollenType.PHASED),
|
||||
'f', Config.hiveFrameMagic
|
||||
});
|
||||
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Config.effectJar), new Object[] {
|
||||
"GSG", "QPQ", "GGG",
|
||||
'G', Block.glass,
|
||||
'G', Blocks.glass,
|
||||
'S', "slabWood",
|
||||
'P', Config.pollen.getStackForType(PollenType.UNUSUAL),
|
||||
'Q', Item.netherQuartz
|
||||
'Q', Items.quartz
|
||||
}));
|
||||
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Config.moonDial), new Object[] {
|
||||
"DqD", "qrq", "DqD",
|
||||
'r', Item.redstone,
|
||||
'q', Item.netherQuartz,
|
||||
'r', Items.redstone,
|
||||
'q', Items.quartz,
|
||||
'D', "dyeGreen"
|
||||
}));
|
||||
|
||||
|
||||
GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.SKULL_FRAGMENT), new Object[] {
|
||||
"xxx", "xxx", "xxx",
|
||||
'x', Config.miscResources.getStackForType(ResourceType.SKULL_CHIP)
|
||||
});
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(Item.skull, 1, 1), new Object[] {
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(Items.skull, 1, 1), new Object[] {
|
||||
"xxx", "xxx",
|
||||
'x', Config.miscResources.getStackForType(ResourceType.SKULL_FRAGMENT)
|
||||
});
|
||||
|
||||
|
||||
GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.DRAGON_CHUNK), new Object[] {
|
||||
"xxx", "xxx",
|
||||
'x', Config.miscResources.getStackForType(ResourceType.DRAGON_DUST)
|
||||
});
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(Block.dragonEgg, 1), new Object[] {
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(Blocks.dragon_egg, 1), new Object[] {
|
||||
"ccc", "cec", "ccc",
|
||||
'c', Config.miscResources.getStackForType(ResourceType.DRAGON_CHUNK),
|
||||
'e', Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE)
|
||||
@@ -152,99 +144,99 @@ public class CraftingManager
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY), new Object[] {
|
||||
"gwg", "wiw", "gwg",
|
||||
'g', Block.glass,
|
||||
'g', Blocks.glass,
|
||||
'w', "waxMagical",
|
||||
'i', Block.blockIron
|
||||
'i', Blocks.iron_block
|
||||
}));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY), new Object[] {
|
||||
"wgw", "gig", "wgw",
|
||||
'g', Block.glass,
|
||||
'g', Blocks.glass,
|
||||
'w', "waxMagical",
|
||||
'i', Block.blockIron
|
||||
'i', Blocks.iron_block
|
||||
}));
|
||||
|
||||
|
||||
GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE), new Object[] {
|
||||
"gwg", "wfw", "gwg",
|
||||
'g', Block.glass,
|
||||
'g', Blocks.glass,
|
||||
'w', Config.wax.getStackForType(WaxType.SOUL),
|
||||
'f', Block.plantRed
|
||||
'f', Blocks.red_flower
|
||||
});
|
||||
GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE), new Object[] {
|
||||
"wgw", "gfg", "wgw",
|
||||
'g', Block.glass,
|
||||
'g', Blocks.glass,
|
||||
'w', Config.wax.getStackForType(WaxType.SOUL),
|
||||
'f', Block.plantRed
|
||||
'f', Blocks.red_flower
|
||||
});
|
||||
|
||||
|
||||
GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE), new Object[] {
|
||||
"gwg", "wfw", "gwg",
|
||||
'g', Block.glass,
|
||||
"gwg", "wfw", "gwg",
|
||||
'g', Blocks.glass,
|
||||
'w', Config.wax.getStackForType(WaxType.SOUL),
|
||||
'f', Item.rottenFlesh
|
||||
'f', Items.rotten_flesh
|
||||
});
|
||||
GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE), new Object[] {
|
||||
"wgw", "gfg", "wgw",
|
||||
'g', Block.glass,
|
||||
"wgw", "gfg", "wgw",
|
||||
'g', Blocks.glass,
|
||||
'w', Config.wax.getStackForType(WaxType.SOUL),
|
||||
'f', Item.rottenFlesh
|
||||
'f', Items.rotten_flesh
|
||||
});
|
||||
|
||||
GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME), new Object[] {
|
||||
"wgw", "gcg", "wgw",
|
||||
'g', Block.glass,
|
||||
'g', Blocks.glass,
|
||||
'w', Config.wax.getStackForType(WaxType.SOUL),
|
||||
'c', Item.pocketSundial
|
||||
'c', Items.clock
|
||||
});
|
||||
GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME), new Object[] {
|
||||
"gwg", "wcw", "gwg",
|
||||
'g', Block.glass,
|
||||
'g', Blocks.glass,
|
||||
'w', Config.wax.getStackForType(WaxType.SOUL),
|
||||
'c', Item.pocketSundial
|
||||
'c', Items.clock
|
||||
});
|
||||
|
||||
|
||||
GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE), new Object[] {
|
||||
"wew", "gcg", "wew",
|
||||
'w', Config.wax.getStackForType(WaxType.SOUL),
|
||||
'c', Item.magmaCream,
|
||||
'e', Item.egg,
|
||||
'g', Block.glowStone
|
||||
'c', Items.magma_cream,
|
||||
'e', Items.egg,
|
||||
'g', Blocks.glowstone
|
||||
});
|
||||
|
||||
|
||||
GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION), new Object[] {
|
||||
"gst", "sEs", "tsg",
|
||||
'g', Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE),
|
||||
't', Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME),
|
||||
's', new ItemStack(Item.skull, 1, 1),
|
||||
'E', Block.dragonEgg,
|
||||
's', new ItemStack(Items.skull, 1, 1),
|
||||
'E', Blocks.dragon_egg,
|
||||
});
|
||||
|
||||
|
||||
// IF YOU UPDATE THESE, CHANGE THE RECIPES IN THAUMCRAFT HELPER, YOU IDIOT.
|
||||
input = new ItemStack(Config.hiveFrameMagic);
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameResilient), new Object[] {
|
||||
Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY),
|
||||
input
|
||||
});
|
||||
|
||||
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameGentle), new Object[] {
|
||||
Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE),
|
||||
input
|
||||
});
|
||||
|
||||
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameNecrotic), new Object[] {
|
||||
Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE),
|
||||
input
|
||||
});
|
||||
|
||||
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameMetabolic), new Object[] {
|
||||
Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE),
|
||||
input
|
||||
});
|
||||
|
||||
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameTemporal), new Object[] {
|
||||
Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME),
|
||||
input
|
||||
});
|
||||
|
||||
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameOblivion), new Object[] {
|
||||
Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION),
|
||||
ItemInterface.getItem("frameProven")
|
||||
@@ -295,66 +287,66 @@ public class CraftingManager
|
||||
'x', "nuggetLead"
|
||||
}));
|
||||
}
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.ingotIron), new Object[] {
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.iron_ingot), new Object[] {
|
||||
"xxx", "xxx", "xxx",
|
||||
'x', "nuggetIron"
|
||||
}));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.diamond), new Object[] {
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.diamond), new Object[] {
|
||||
"xxx", "xxx", "xxx",
|
||||
'x', "shardDiamond"
|
||||
}));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.emerald), new Object[] {
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.emerald), new Object[] {
|
||||
"xxx", "xxx", "xxx",
|
||||
'x', "shardEmerald"
|
||||
}));
|
||||
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(ItemInterface.getItem("apatite"), new Object[] {
|
||||
"xxx", "xxx", "xxx",
|
||||
'x', Config.nuggets.getStackForType(NuggetType.APATITE)
|
||||
}));
|
||||
|
||||
|
||||
output = Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY);
|
||||
GameRegistry.addRecipe(output, new Object[] {
|
||||
" G ", "QEQ", " W ",
|
||||
'E', Item.eyeOfEnder,
|
||||
'Q', Block.blockNetherQuartz,
|
||||
'W', Block.whiteStone,
|
||||
'G', Block.blockGold
|
||||
'E', Items.ender_eye,
|
||||
'Q', Blocks.quartz_block,
|
||||
'W', Blocks.end_stone,
|
||||
'G', Blocks.gold_block
|
||||
});
|
||||
|
||||
|
||||
output = Config.voidCapsule.getCapsuleForLiquid(FluidType.EMPTY);
|
||||
output.stackSize = 4;
|
||||
GameRegistry.addRecipe(output, new Object[] {
|
||||
"T T", "GFG", "T T",
|
||||
'G', Block.thinGlass,
|
||||
'G', Blocks.glass_pane,
|
||||
'F', Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY),
|
||||
'T', Item.goldNugget
|
||||
'T', Items.gold_nugget
|
||||
});
|
||||
|
||||
|
||||
output = new ItemStack(Config.magnet);
|
||||
GameRegistry.addRecipe(output, new Object[] {
|
||||
" i ", "cSc", " d ",
|
||||
'i', Item.ingotIron,
|
||||
'c', Item.compass,
|
||||
'd', Item.diamond,
|
||||
'i', Items.iron_ingot,
|
||||
'c', Items.compass,
|
||||
'd', Items.diamond,
|
||||
'S', Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY)
|
||||
});
|
||||
|
||||
|
||||
for (int level = 1; level <= 8; level++)
|
||||
{
|
||||
output = new ItemStack(Config.magnet, 1, level * 2);
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(output, new Object[] {
|
||||
" d ", "mSm", " B ",
|
||||
'd', Item.diamond,
|
||||
'd', Items.diamond,
|
||||
'm', "mb.magnet.level" + (level - 1),
|
||||
'B', Block.blockRedstone,
|
||||
'B', Blocks.redstone_block,
|
||||
'S', Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY)
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (ThaumcraftHelper.isActive())
|
||||
{
|
||||
@@ -385,20 +377,20 @@ public class CraftingManager
|
||||
" W ", "W W", " W ",
|
||||
'W', Config.wax
|
||||
});*/
|
||||
|
||||
|
||||
input = Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT);
|
||||
output = new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.KNOWLEDGE_FRAGMENT.ordinal());
|
||||
GameRegistry.addShapelessRecipe(output, new Object[] {
|
||||
input, input, input, input
|
||||
});
|
||||
|
||||
|
||||
// T1 Thaumaturge's backpack
|
||||
GameRegistry.addRecipe(new ItemStack(Config.thaumaturgeBackpackT1), new Object[] {
|
||||
"SWS", "NCN", "SWS",
|
||||
'S', Item.silk,
|
||||
'W', Block.cloth,
|
||||
'N', new ItemStack(Config.tcMiscResource.itemID, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()),
|
||||
'C', Block.chest
|
||||
'S', Items.string,
|
||||
'W', Blocks.wool,
|
||||
'N', new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()),
|
||||
'C', Blocks.chest
|
||||
});
|
||||
|
||||
// "bottling" Crystal aspects.
|
||||
@@ -415,7 +407,7 @@ public class CraftingManager
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
|
||||
if (ArsMagicaHelper.isActive())
|
||||
{
|
||||
input = ItemInterface.getItem("apatite");
|
||||
@@ -430,75 +422,90 @@ public class CraftingManager
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static void setupCentrifugeRecipes()
|
||||
{
|
||||
ItemStack beeswax = ItemInterface.getItem("beeswax");
|
||||
ItemStack propolis = ItemInterface.getItem("propolis");
|
||||
propolis.setItemDamage(ForestryHelper.Propolis.PULSATING.ordinal());
|
||||
|
||||
|
||||
// 20 is the 'average' time to centrifuge a comb.
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.MUNDANE),
|
||||
new ItemStack[] {beeswax, ItemInterface.getItem("honeyDrop"), Config.wax.getStackForType(WaxType.MAGIC)},
|
||||
new ItemStack[] {beeswax, ItemInterface.getItem("honeyDrop"),
|
||||
Config.wax.getStackForType(WaxType.MAGIC)},
|
||||
new int[] {90, 60, 10});
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.MOLTEN),
|
||||
new ItemStack[] {ItemInterface.getItem("refractoryWax"), ItemInterface.getItem("honeyDrop")},
|
||||
new ItemStack[] {ItemInterface.getItem("refractoryWax"),
|
||||
ItemInterface.getItem("honeyDrop")},
|
||||
new int[] {86, 8});
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.FORGOTTEN),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.AMNESIC), propolis, ItemInterface.getItem("honeyDrop")},
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.FORGOTTEN),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.AMNESIC), propolis,
|
||||
ItemInterface.getItem("honeyDrop")},
|
||||
new int[] {50, 50, 22});
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.OCCULT),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), ItemInterface.getItem("honeyDrop") },
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), GameRegistry.findItemStack("forestry",
|
||||
"honeyDrop", 1) },
|
||||
new int[] { 100, 60 });
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.OTHERWORLDLY),
|
||||
new ItemStack[] {beeswax, Config.wax.getStackForType(WaxType.MAGIC), ItemInterface.getItem("honeyDrop") },
|
||||
new ItemStack[] {beeswax, Config.wax.getStackForType(WaxType.MAGIC),
|
||||
ItemInterface.getItem("honeyDrop") },
|
||||
new int[] { 50, 20, 100 });
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.PAPERY),
|
||||
new ItemStack[] {ItemInterface.getItem("beeswax"), Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.paper) },
|
||||
new ItemStack[] {ItemInterface.getItem("beeswax"),
|
||||
Config.wax.getStackForType(WaxType.MAGIC),
|
||||
new ItemStack(Items.paper) },
|
||||
new int[] { 80, 20, 5 });
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.INTELLECT),
|
||||
new ItemStack[] { Config.wax.getStackForType(WaxType.MAGIC), ItemInterface.getItem("honeydew"), Config.drops.getStackForType(DropType.INTELLECT) },
|
||||
new ItemStack[] { Config.wax.getStackForType(WaxType.MAGIC), GameRegistry.findItemStack("forestry",
|
||||
"honeydew", 1), Config.drops.getStackForType(DropType.INTELLECT) },
|
||||
new int[] { 90, 40, 10 });
|
||||
propolis.setItemDamage(ForestryHelper.Propolis.NORMAL.ordinal());
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.FURTIVE),
|
||||
new ItemStack[] {ItemInterface.getItem("beeswax"), propolis, ItemInterface.getItem("honeydew") },
|
||||
new ItemStack[] {ItemInterface.getItem("beeswax"), propolis,
|
||||
ItemInterface.getItem("honeydew") },
|
||||
new int[] { 90, 20, 35 });
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.SOUL),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.SOUL), ItemInterface.getItem("honeydew") },
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.SOUL), GameRegistry.findItemStack("forestry",
|
||||
"honeydew", 1) },
|
||||
new int[] { 95, 26 });
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TEMPORAL),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.pollen.getStackForType(PollenType.PHASED), new ItemStack(Config.fHoneydew, 1)},
|
||||
new int[] {100, 5, 60});
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TRANSMUTED),
|
||||
new ItemStack[] {ItemInterface.getItem("beeswax"), Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.UNSTABLE)},
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TRANSMUTED),
|
||||
new ItemStack[] {ItemInterface.getItem("beeswax"),
|
||||
Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.UNSTABLE)},
|
||||
new int[] {80, 80, 15});
|
||||
|
||||
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AIRY),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.feather) },
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Items.feather) },
|
||||
new int[] { 100, 60 });
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.FIREY),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.blazePowder) },
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Items.blaze_powder) },
|
||||
new int[] { 100, 60 });
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.WATERY),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.dyePowder) },
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Items.dye) },
|
||||
new int[] { 100, 60 });
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.EARTHY),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.clay) },
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Items.clay_ball) },
|
||||
new int[] { 100, 60 });
|
||||
|
||||
if (ThaumcraftHelper.isActive())
|
||||
{
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_AIR),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.feather), Config.propolis.getStackForType(PropolisType.AIR) },
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Items.feather),
|
||||
Config.propolis.getStackForType(PropolisType.AIR) },
|
||||
new int[] { 100, 60, 80 });
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_FIRE),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.blazePowder), Config.propolis.getStackForType(PropolisType.FIRE) },
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Items.blaze_powder),
|
||||
Config.propolis.getStackForType(PropolisType.FIRE) },
|
||||
new int[] { 100, 60, 80 });
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_WATER),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.dyePowder), Config.propolis.getStackForType(PropolisType.WATER) },
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Items.dye),
|
||||
Config.propolis.getStackForType(PropolisType.WATER) },
|
||||
new int[] { 100, 60, 80 });
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_EARTH),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.clay), Config.propolis.getStackForType(PropolisType.EARTH) },
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Items.clay_ball),
|
||||
Config.propolis.getStackForType(PropolisType.EARTH) },
|
||||
new int[] { 100, 60, 80 });
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_ORDER),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.ORDER) },
|
||||
@@ -526,34 +533,36 @@ public class CraftingManager
|
||||
new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_CHAOS) },
|
||||
new int[] { 100, 65 } );
|
||||
}
|
||||
|
||||
|
||||
if (ArsMagicaHelper.isActive())
|
||||
{
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AM_ESSENCE),
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AM_ESSENCE),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Config.amItemResource), new ItemStack(Config.amItemResource) },
|
||||
new int[] { 85, 10, 2 } );
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AM_POTENT),
|
||||
new ItemStack[] {ItemInterface.getItem("beeswax"), ItemInterface.getItem("refractoryWax"), ItemInterface.getItem("honeydew") },
|
||||
new ItemStack[] {ItemInterface.getItem("beeswax"),
|
||||
ItemInterface.getItem("refractoryWax"),
|
||||
ItemInterface.getItem("honeydew")},
|
||||
new int[] { 50, 50, 65 } );
|
||||
}
|
||||
if (ThermalExpansionHelper.isActive())
|
||||
{
|
||||
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TE_DESTABILIZED),
|
||||
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TE_DESTABILIZED),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.drops.getStackForType(DropType.DESTABILIZED)},
|
||||
new int[] {50, 22});
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TE_CARBON),
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TE_CARBON),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.drops.getStackForType(DropType.CARBON)},
|
||||
new int[] {50, 22});
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TE_LUX),
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TE_LUX),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.drops.getStackForType(DropType.LUX)},
|
||||
new int[] {50, 22});
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TE_ENDEARING),
|
||||
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TE_ENDEARING),
|
||||
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.drops.getStackForType(DropType.ENDEARING)},
|
||||
new int[] {50, 22});
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private static void setupCarpenterRecipes()
|
||||
@@ -566,7 +575,7 @@ public class CraftingManager
|
||||
RecipeManagers.carpenterManager.addRecipe(30, new FluidStack(FluidRegistry.WATER, 600), null, output, new Object[] {
|
||||
" S ", "WWW", "WWW",
|
||||
'W', Config.wax,
|
||||
'S', Item.silk
|
||||
'S', Items.string
|
||||
});
|
||||
|
||||
output = BlockInterface.getBlock("candle");
|
||||
@@ -593,7 +602,7 @@ public class CraftingManager
|
||||
'J', ItemInterface.getItem("royalJelly"),
|
||||
'D', Config.drops.getStackForType(DropType.ENCHANTED)
|
||||
});
|
||||
|
||||
|
||||
if (ThaumcraftHelper.isActive())
|
||||
{
|
||||
// Carpenter recipes
|
||||
@@ -602,7 +611,7 @@ public class CraftingManager
|
||||
output = new ItemStack(Config.thaumaturgeBackpackT2);
|
||||
RecipeManagers.carpenterManager.addRecipe(200, new FluidStack(FluidRegistry.WATER, 1000), null, output, new Object[] {
|
||||
"WXW", "WTW", "WWW",
|
||||
'X', Item.diamond,
|
||||
'X', Items.diamond,
|
||||
'W', input,
|
||||
'T', new ItemStack(Config.thaumaturgeBackpackT1)
|
||||
});
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
+3
-2
@@ -3,6 +3,7 @@ package magicbees.main.utils;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import magicbees.item.types.ResourceType;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.MagicBees;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -17,8 +18,8 @@ public class TabMagicBees extends CreativeTabs
|
||||
super(getNextID(), "magicBees");
|
||||
}
|
||||
|
||||
public ItemStack getIconItemStack()
|
||||
public Item getTabIconItem()
|
||||
{
|
||||
return MagicBees.getConfig().miscResources.getStackForType(ResourceType.RESEARCH_BEEINFUSION);
|
||||
return Config.miscResources.getStackForType(ResourceType.RESEARCH_BEEINFUSION).getItem();
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package magicbees.main.utils;
|
||||
/*package magicbees.main.utils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.EnumSet;
|
||||
@@ -101,4 +101,4 @@ public class TickHandlerVersion implements IScheduledTickHandler
|
||||
}
|
||||
return 72000;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
+18
-17
@@ -1,20 +1,14 @@
|
||||
package magicbees.main.utils;
|
||||
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import magicbees.main.MagicBees;
|
||||
|
||||
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import cpw.mods.fml.common.registry.TickRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
||||
/**
|
||||
* Using some of the VersionInfo code from cofh. (Thanks, Lemming!)
|
||||
* @author MysteriousAges
|
||||
@@ -44,7 +38,7 @@ public class VersionInfo
|
||||
String modName;
|
||||
String modVersion;
|
||||
String releaseURL;
|
||||
Logger modLogger = FMLLog.getLogger();
|
||||
//Logger modLogger = FMLLog.getLogger();
|
||||
|
||||
public static int[] parseVersion(String rawVersion)
|
||||
{
|
||||
@@ -136,7 +130,7 @@ public class VersionInfo
|
||||
modName = name;
|
||||
modVersion = latestModVersion = version;
|
||||
releaseURL = url;
|
||||
modLogger = logger;
|
||||
//modLogger = logger;
|
||||
}
|
||||
|
||||
public void checkForNewVersion()
|
||||
@@ -217,23 +211,30 @@ public class VersionInfo
|
||||
|
||||
if (beforeTargetVersion(modVersion, latestModVersion))
|
||||
{
|
||||
modLogger.log(Level.INFO, "An updated version of " + modName + " is available: " + latestModVersion + ".");
|
||||
FMLLog.info("An updated version of " + modName + " is available: " + latestModVersion + ".");
|
||||
//modLogger.log(Level.INFO, "An updated version of " + modName + " is available: " +
|
||||
// latestModVersion + ".");
|
||||
newVersion = true;
|
||||
if (criticalUpdate)
|
||||
{
|
||||
modLogger.log(Level.INFO, "This update has been marked as CRITICAL and will ignore notification suppression.");
|
||||
FMLLog.info("This update has been marked as CRITICAL and will ignore notification suppression" +
|
||||
".");
|
||||
//modLogger.log(Level.INFO, "This update has been marked as CRITICAL and will ignore " +
|
||||
// "notification suppression.");
|
||||
}
|
||||
if (beforeTargetVersion(MCVersion, latestMCVersion))
|
||||
{
|
||||
newMinecraftVersion = true;
|
||||
modLogger.log(Level.INFO, "This update is for Minecraft " + latestMCVersion + ".");
|
||||
//modLogger.log(Level.INFO, "This update is for Minecraft " + latestMCVersion + ".");
|
||||
FMLLog.info("This update is for Minecraft " + latestMCVersion + ".");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
modLogger.log(Level.WARNING, "Version Check Failed: " + e.getMessage());
|
||||
//modLogger.log(Level.WARNING, "Version Check Failed: " + e.getMessage());
|
||||
FMLLog.warning("Version check Failed: " + e.getMessage());
|
||||
}
|
||||
versionCheckComplete = true;
|
||||
}
|
||||
@@ -242,9 +243,9 @@ public class VersionInfo
|
||||
public static void doVersionCheck()
|
||||
{
|
||||
VersionInfo main = new VersionInfo(ModName, Version, VersionURL);
|
||||
TickHandlerVersion.registerModVersionInfo(main);
|
||||
TickHandlerVersion.initialize();
|
||||
TickRegistry.registerScheduledTickHandler(TickHandlerVersion.instance, Side.CLIENT);
|
||||
/*TickHandlerVersion.registerModVersionInfo(main);
|
||||
TickHandlerVersion.initialize();*/
|
||||
//TickRegistry.registerScheduledTickHandler(TickHandlerVersion.instance, Side.CLIENT);
|
||||
|
||||
VersionCheckThread thread = main.new VersionCheckThread();
|
||||
thread.start();
|
||||
+1
-1
@@ -1,9 +1,9 @@
|
||||
package magicbees.main.utils.compat;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import magicbees.main.Config;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
|
||||
public class ArsMagicaHelper
|
||||
{
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
package magicbees.main.utils.compat;
|
||||
|
||||
import magicbees.main.Config;
|
||||
import net.minecraft.item.Item;
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import magicbees.main.Config;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
public class EquivalentExchangeHelper
|
||||
{
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
package magicbees.main.utils.compat;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
public class ExtraBeesHelper
|
||||
{
|
||||
public enum CombType
|
||||
+4
-6
@@ -1,15 +1,13 @@
|
||||
package magicbees.main.utils.compat;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import magicbees.bees.BeeManager;
|
||||
import magicbees.main.Config;
|
||||
import net.minecraft.block.Block;
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import forestry.api.core.EnumHumidity;
|
||||
import forestry.api.core.EnumTemperature;
|
||||
import forestry.api.core.ItemInterface;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import magicbees.bees.BeeManager;
|
||||
import magicbees.main.Config;
|
||||
import net.minecraft.block.Block;
|
||||
|
||||
public class ForestryHelper
|
||||
{
|
||||
+2
-18
@@ -1,24 +1,8 @@
|
||||
package magicbees.main.utils.compat;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import magicbees.item.types.PollenType;
|
||||
import magicbees.item.types.PropolisType;
|
||||
import magicbees.item.types.ResourceType;
|
||||
import magicbees.item.types.WaxType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.MagicBees;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.item.crafting.ShapelessRecipes;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import forestry.api.core.ItemInterface;
|
||||
import magicbees.main.Config;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class RedstoneArsenalHelper
|
||||
{
|
||||
+143
-120
@@ -1,17 +1,17 @@
|
||||
package magicbees.main.utils.compat;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import forestry.api.core.BlockInterface;
|
||||
import forestry.api.core.ItemInterface;
|
||||
import magicbees.item.types.PollenType;
|
||||
import magicbees.item.types.PropolisType;
|
||||
import magicbees.item.types.ResourceType;
|
||||
import magicbees.item.types.WaxType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.MagicBees;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.item.crafting.ShapelessRecipes;
|
||||
@@ -25,9 +25,8 @@ import thaumcraft.api.crafting.InfusionRecipe;
|
||||
import thaumcraft.api.research.ResearchCategories;
|
||||
import thaumcraft.api.research.ResearchItem;
|
||||
import thaumcraft.api.research.ResearchPage;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import forestry.api.core.ItemInterface;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class ThaumcraftHelper
|
||||
{
|
||||
@@ -199,39 +198,39 @@ public class ThaumcraftHelper
|
||||
|
||||
private static void addItemsToBackpack()
|
||||
{
|
||||
if (MagicBees.getConfig().AddThaumcraftItemsToBackpacks)
|
||||
{
|
||||
// Add all shards and Thaumium to miner's backpack
|
||||
String ids = Config.tcShard.itemID + ":" + -1 + ";"
|
||||
+ Config.tcMiscResource.itemID + ":" + ThaumcraftHelper.MiscResource.THAUMIUM.ordinal();
|
||||
FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "miner@" + ids);
|
||||
|
||||
// All resources go into Thaumaturge's backpack
|
||||
ids = Config.tcMiscResource.itemID + ":" + -1 + ";"
|
||||
+ Config.tcShard.itemID + ":" + -1 + ";"
|
||||
+ Config.tcFilledJar.itemID + ":" + -1 + ";"
|
||||
+ Config.tcCrystal.blockID + ":" + -1 + ";"
|
||||
+ Config.tcJar.blockID + ":" + -1 + ";"
|
||||
+ Config.tcGolem.itemID + ":" + -1 + ";";
|
||||
FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "thaumaturge@" + ids);
|
||||
|
||||
// Add some plants & saplings to Forester's
|
||||
ids = Config.tcPlant.blockID + ":" + "-1" + ";"
|
||||
+ Config.tcLeaf.blockID + ":" + -1 + ";"
|
||||
+ Config.tcLog.blockID + ":" + "-1";
|
||||
FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "forester@" + ids);
|
||||
|
||||
// Add Wisp & brains to Hunter's
|
||||
ids = /*Config.tcWispEssence.itemID + ":" + -1 + ";"
|
||||
+*/ Config.tcMiscResource.itemID + ":" + ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal();
|
||||
FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "hunter@" + ids);
|
||||
|
||||
// Add Marker, warded stone, candle to builder
|
||||
ids = Config.tcCandle.blockID + ":" + -1 + ";"
|
||||
+ Config.tcMarker.blockID + ":" + -1 + ";"
|
||||
+ Config.tcWarded.blockID + ":" + -1;
|
||||
FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "builder@" + ids);
|
||||
}
|
||||
// if (MagicBees.getConfig().AddThaumcraftItemsToBackpacks)
|
||||
// {
|
||||
// // Add all shards and Thaumium to miner's backpack
|
||||
// String ids = Config.tcShard.itemID + ":" + -1 + ";"
|
||||
// + Config.tcMiscResource.itemID + ":" + ThaumcraftHelper.MiscResource.THAUMIUM.ordinal();
|
||||
// FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "miner@" + ids);
|
||||
//
|
||||
// // All resources go into Thaumaturge's backpack
|
||||
// ids = Config.tcMiscResource.itemID + ":" + -1 + ";"
|
||||
// + Config.tcShard.itemID + ":" + -1 + ";"
|
||||
// + Config.tcFilledJar.itemID + ":" + -1 + ";"
|
||||
// + Config.tcCrystal.blockID + ":" + -1 + ";"
|
||||
// + Config.tcJar.blockID + ":" + -1 + ";"
|
||||
// + Config.tcGolem.itemID + ":" + -1 + ";";
|
||||
// FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "thaumaturge@" + ids);
|
||||
//
|
||||
// // Add some plants & saplings to Forester's
|
||||
// ids = Config.tcPlant.blockID + ":" + "-1" + ";"
|
||||
// + Config.tcLeaf.blockID + ":" + -1 + ";"
|
||||
// + Config.tcLog.blockID + ":" + "-1";
|
||||
// FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "forester@" + ids);
|
||||
//
|
||||
// // Add Wisp & brains to Hunter's
|
||||
// ids = /*Config.tcWispEssence.itemID + ":" + -1 + ";"
|
||||
// +*/ Config.tcMiscResource.itemID + ":" + ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal();
|
||||
// FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "hunter@" + ids);
|
||||
//
|
||||
// // Add Marker, warded stone, candle to builder
|
||||
// ids = Config.tcCandle.blockID + ":" + -1 + ";"
|
||||
// + Config.tcMarker.blockID + ":" + -1 + ";"
|
||||
// + Config.tcWarded.blockID + ":" + -1;
|
||||
// FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "builder@" + ids);
|
||||
// }
|
||||
}
|
||||
|
||||
private static void setupCrafting()
|
||||
@@ -265,51 +264,52 @@ public class ThaumcraftHelper
|
||||
thaumScoop = ThaumcraftApi.addArcaneCraftingRecipe("MB_Scoop", new ItemStack(Config.thaumiumScoop),
|
||||
new AspectList().add(Aspect.ORDER, 2), new Object[] {
|
||||
"sWs", "sTs", " T ",
|
||||
's', Item.stick,
|
||||
'W', Block.cloth,
|
||||
's', Items.stick,
|
||||
'W', Blocks.wool,
|
||||
'T', new ItemStack(Config.tcMiscResource, 1, MiscResource.THAUMIUM.ordinal())
|
||||
});
|
||||
|
||||
thaumGrafter = ThaumcraftApi.addArcaneCraftingRecipe("MB_Grafter", new ItemStack(Config.thaumiumGrafter),
|
||||
new AspectList().add(Aspect.ORDER, 5), new Object[] {
|
||||
" T", " s ", "s ",
|
||||
's', Item.stick,
|
||||
's', Items.stick,
|
||||
'T', new ItemStack(Config.tcMiscResource, 1, MiscResource.THAUMIUM.ordinal())
|
||||
});
|
||||
|
||||
frameMagic = ThaumcraftApi.addArcaneCraftingRecipe("MB_FrameMagic", new ItemStack(Config.hiveFrameMagic),
|
||||
new AspectList().add(Aspect.ORDER, 5).add(Aspect.AIR, 2).add(Aspect.EARTH, 2), new Object[] {
|
||||
"sss", "sCs", "sss",
|
||||
's', Item.stick,
|
||||
's', Items.stick,
|
||||
'C', new ItemStack(Config.tcMiscResource, 1, MiscResource.ENCHANTED_FABRIC.ordinal())
|
||||
});
|
||||
|
||||
essenceLife = ThaumcraftApi.addCrucibleRecipe("MB_EssenceLife", Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE),
|
||||
new ItemStack(Block.plantRed), new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.PLANT, 4));
|
||||
new ItemStack(Blocks.red_flower), new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.PLANT, 4));
|
||||
|
||||
essenceDeath = ThaumcraftApi.addCrucibleRecipe("MB_EssenceDeath", Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE),
|
||||
new ItemStack(Item.rottenFlesh), new AspectList().add(Aspect.DEATH, 4).add(Aspect.ENTROPY, 4));
|
||||
new ItemStack(Items.rotten_flesh), new AspectList().add(Aspect.DEATH, 4).add(Aspect.ENTROPY, 4));
|
||||
|
||||
essenceArmor = ThaumcraftApi.addCrucibleRecipe("MB_EssenceArmor", Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY),
|
||||
new ItemStack(Item.leather), new AspectList().add(Aspect.ARMOR, 4).add(Aspect.MAGIC, 2));
|
||||
new ItemStack(Items.leather), new AspectList().add(Aspect.ARMOR, 4).add(Aspect.MAGIC, 2));
|
||||
|
||||
output = Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE);
|
||||
essenceUnstableA = ThaumcraftApi.addCrucibleRecipe("MB_EssenceUnstable", output,
|
||||
Config.propolis.getStackForType(PropolisType.UNSTABLE), new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.EXCHANGE, 1));
|
||||
|
||||
essenceUnstableB = ThaumcraftApi.addCrucibleRecipe("MB_EssenceUnstable", output,
|
||||
new ItemStack(Block.netherrack), new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.EXCHANGE, 5));
|
||||
new ItemStack(Blocks.netherrack), new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.EXCHANGE, 5));
|
||||
|
||||
essenceTime = ThaumcraftApi.addCrucibleRecipe("MB_EssenceTime", Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME),
|
||||
new ItemStack(Item.pocketSundial), new AspectList().add(Aspect.ORDER, 10).add(Aspect.VOID, 10).add(Aspect.TRAP, 4));
|
||||
new ItemStack(Items.clock), new AspectList().add(Aspect.ORDER, 10).add(Aspect.VOID,
|
||||
10).add(Aspect.TRAP, 4));
|
||||
|
||||
input = new ItemStack(Item.enderPearl);
|
||||
input = new ItemStack(Items.ender_pearl);
|
||||
singularityA = ThaumcraftApi.addInfusionCraftingRecipe("MB_DimensionalSingularity", Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY, 3),
|
||||
5, new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 20),
|
||||
new ItemStack(Block.blockGold),
|
||||
new ItemStack(Blocks.gold_block),
|
||||
new ItemStack[] { input, input});
|
||||
|
||||
ItemStack in2 = new ItemStack(Item.diamond);
|
||||
ItemStack in2 = new ItemStack(Items.diamond);
|
||||
singularityB = ThaumcraftApi.addInfusionCraftingRecipe("MB_DimensionalSingularity", Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY, 3),
|
||||
6, new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 20).add(Aspect.VOID, 15),
|
||||
Config.propolis.getStackForType(PropolisType.UNSTABLE),
|
||||
@@ -318,7 +318,7 @@ public class ThaumcraftHelper
|
||||
essenceOblivion = ThaumcraftApi.addShapelessArcaneCraftingRecipe("MB_EssenceOblivion", Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION),
|
||||
new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.AIR, 40).add(Aspect.ORDER, 15), new Object[] {
|
||||
Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY),
|
||||
Block.dragonEgg,
|
||||
Blocks.dragon_egg,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -463,7 +463,7 @@ public class ThaumcraftHelper
|
||||
|
||||
list = new ArrayList<Object>(2);
|
||||
list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION));
|
||||
list.add(forestry.api.core.ItemInterface.getItem("frameProven"));
|
||||
list.add(ItemInterface.getItem("frameProven"));
|
||||
recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameOblivion), list);
|
||||
|
||||
ResearchItem essenceOblivionR = new ResearchItem("MB_EssenceOblivion", category, new AspectList().add(Aspect.VOID, 2).add(Aspect.HUNGER, 1).add((Aspect)aspectTime, 1),
|
||||
@@ -489,150 +489,173 @@ public class ThaumcraftHelper
|
||||
{
|
||||
ItemStack item;
|
||||
AspectList list;
|
||||
|
||||
ThaumcraftApi.registerObjectTag(Item.pocketSundial.itemID, 0, new AspectList(Item.pocketSundial.itemID, 0).add((Aspect)aspectTime, 4));
|
||||
ThaumcraftApi.registerObjectTag(Item.redstoneRepeater.itemID, 0, new AspectList(Item.redstoneRepeater.itemID, 0).add((Aspect)aspectTime, 2));
|
||||
|
||||
list = new AspectList(Block.wood.blockID, 0);
|
||||
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Items.clock), new AspectList(new ItemStack(Items.clock)).add(
|
||||
(Aspect) aspectTime, 4));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Items.repeater), new AspectList(new ItemStack(Items.repeater)).add(
|
||||
(Aspect)aspectTime, 2));
|
||||
|
||||
|
||||
list = new AspectList(new ItemStack(Blocks.log));
|
||||
for (int i = 1; i <= 8; i++)
|
||||
{
|
||||
item = forestry.api.core.BlockInterface.getBlock("log" + i);
|
||||
if (item != null)
|
||||
{
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, -1, list);
|
||||
ThaumcraftApi.registerObjectTag(item, list);
|
||||
}
|
||||
}
|
||||
|
||||
list = new AspectList(Block.planks.blockID, 0);
|
||||
|
||||
list = new AspectList(new ItemStack(Blocks.planks));
|
||||
for (int i = 1; i <= 2; i++)
|
||||
{
|
||||
item = forestry.api.core.BlockInterface.getBlock("planks" + i);
|
||||
item = BlockInterface.getBlock("planks" + i);
|
||||
if (item != null)
|
||||
{
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, -1, list);
|
||||
ThaumcraftApi.registerObjectTag(item, list);
|
||||
}
|
||||
}
|
||||
|
||||
list = new AspectList().add(Aspect.ORDER, 5).add(Aspect.ARMOR, 2).add(Aspect.BEAST, 1);
|
||||
item = new ItemStack(Config.fHiveBlock);
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, -1, list);
|
||||
ThaumcraftApi.registerObjectTag(Config.hive.blockID, -1, list);
|
||||
ThaumcraftApi.registerObjectTag(item, list);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.hive), list);
|
||||
|
||||
list = new AspectList().add(Aspect.LIGHT, 1);
|
||||
item = forestry.api.core.BlockInterface.getBlock("candle");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), list);
|
||||
item = BlockInterface.getBlock("candle");
|
||||
ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list);
|
||||
|
||||
list = new AspectList().add(Aspect.DARKNESS, 1);
|
||||
item = forestry.api.core.BlockInterface.getBlock("stump");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), list);
|
||||
item = BlockInterface.getBlock("stump");
|
||||
ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list);
|
||||
|
||||
list = new AspectList(Block.glass.blockID, 0).add(Aspect.SENSES, 1);
|
||||
item = forestry.api.core.BlockInterface.getBlock("glass");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, -1, list);
|
||||
list = new AspectList(new ItemStack(Blocks.glass)).add(Aspect.SENSES, 1);
|
||||
item = BlockInterface.getBlock("glass");
|
||||
ThaumcraftApi.registerObjectTag(item, list);
|
||||
|
||||
list = new AspectList().add(Aspect.EARTH, 2).add(Aspect.WATER, 2);
|
||||
item = forestry.api.core.BlockInterface.getBlock("soil");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, 1, list);
|
||||
item = BlockInterface.getBlock("soil");
|
||||
ThaumcraftApi.registerObjectTag(item, new int[]{1}, list);
|
||||
|
||||
list = new AspectList(Block.leaves.blockID, 0);
|
||||
item = forestry.api.core.BlockInterface.getBlock("leaves");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), list);
|
||||
list = new AspectList(new ItemStack(Blocks.leaves));
|
||||
item = BlockInterface.getBlock("leaves");
|
||||
ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list);
|
||||
|
||||
list = new AspectList(Block.sapling.blockID, 0);
|
||||
list = new AspectList(new ItemStack(Blocks.sapling));
|
||||
item = forestry.api.core.BlockInterface.getBlock("saplingGE");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, -1, list);
|
||||
ThaumcraftApi.registerObjectTag(item, list);
|
||||
|
||||
list = new AspectList().add(Aspect.SEED, 1).add(Aspect.PLANT, 1);
|
||||
list = new AspectList()/*.add(Aspect.SEED, 1)*/.add(Aspect.PLANT, 1);
|
||||
item = forestry.api.core.ItemInterface.getItem("pollenFertile");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, -1, list);
|
||||
ThaumcraftApi.registerObjectTag(item, list);
|
||||
|
||||
list = new AspectList().add(Aspect.CRYSTAL, 1).add(Aspect.EARTH, 2);
|
||||
item = forestry.api.core.BlockInterface.getBlock("resources");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, ForestryHelper.BlockResource.APATITE.ordinal(), list.copy().add(Aspect.STONE, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.BlockResource.APATITE.ordinal()),
|
||||
list.copy()/*.add(Aspect.STONE, 2)*/);
|
||||
item = forestry.api.core.ItemInterface.getItem("apatite");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), list.copy().add(Aspect.CRYSTAL, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, item.getItemDamage()),
|
||||
list.copy().add(Aspect.CRYSTAL, 2));
|
||||
|
||||
|
||||
list = new AspectList().add(Aspect.MOTION, 2).add(Aspect.FLIGHT, 1);
|
||||
item = forestry.api.core.ItemInterface.getItem("beeDroneGE");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, -1, list);
|
||||
ThaumcraftApi.registerObjectTag(item, list);
|
||||
list = list.copy().add(Aspect.GREED, 2).add(Aspect.EXCHANGE, 1);
|
||||
item = forestry.api.core.ItemInterface.getItem("beePrincessGE");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, -1, list);
|
||||
ThaumcraftApi.registerObjectTag(item, list);
|
||||
item = forestry.api.core.ItemInterface.getItem("beeQueenGE");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, -1, list);
|
||||
ThaumcraftApi.registerObjectTag(item, list);
|
||||
list = new AspectList().add(Aspect.LIFE, 2).add(Aspect.EXCHANGE, 5);
|
||||
item = forestry.api.core.ItemInterface.getItem("beeLarvaeGE");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, -1, list);
|
||||
ThaumcraftApi.registerObjectTag(item, list);
|
||||
|
||||
item = forestry.api.core.ItemInterface.getItem("scoop");
|
||||
list = new AspectList(item.itemID, 0).add(Aspect.TOOL, 2);
|
||||
ThaumcraftApi.registerComplexObjectTag(item.itemID, 0, list);
|
||||
list = new AspectList(new ItemStack(item.getItem(), 1, 0)).add(Aspect.TOOL, 2);
|
||||
ThaumcraftApi.registerComplexObjectTag(item, list);
|
||||
|
||||
item = forestry.api.core.ItemInterface.getItem("grafter");
|
||||
list = new AspectList(item.itemID, item.getItemDamage()).add(Aspect.TOOL, 2);
|
||||
ThaumcraftApi.registerComplexObjectTag(item.itemID, 0, list);
|
||||
list = new AspectList(new ItemStack(item.getItem(), 1, item.getItemDamage())).add(Aspect.TOOL, 2);
|
||||
ThaumcraftApi.registerComplexObjectTag(item, list);
|
||||
|
||||
item = forestry.api.core.ItemInterface.getItem("grafterProven");
|
||||
list = list.copy().add(Aspect.TOOL, 2).add(Aspect.EXCHANGE, 3);
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), list);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, item.getItemDamage()), list);
|
||||
|
||||
list = new AspectList().add(Aspect.TRAP, 2);
|
||||
ThaumcraftApi.registerObjectTag("beeComb", list);
|
||||
|
||||
list = new AspectList().add(Aspect.SLIME, 1);
|
||||
item = forestry.api.core.ItemInterface.getItem("propolis");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, ForestryHelper.Propolis.NORMAL.ordinal(), list);
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, ForestryHelper.Propolis.SILKY.ordinal(), list.copy().add(Aspect.SLIME, 2));
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, ForestryHelper.Propolis.PULSATING.ordinal(), list.copy().add(Aspect.ELDRITCH, 2));
|
||||
ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.UNSTABLE.ordinal(), list.copy().add(Aspect.ENTROPY, 1).add(Aspect.EXCHANGE, 1));
|
||||
ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.AIR.ordinal(), list.copy().add(Aspect.AIR, 2));
|
||||
ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.WATER.ordinal(), list.copy().add(Aspect.WATER, 2));
|
||||
ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.FIRE.ordinal(), list.copy().add(Aspect.FIRE, 2));
|
||||
ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.EARTH.ordinal(), list.copy().add(Aspect.EARTH, 2));
|
||||
ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.ORDER.ordinal(), list.copy().add(Aspect.ORDER, 2));
|
||||
ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.CHAOS.ordinal(), list.copy().add(Aspect.ENTROPY, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.NORMAL.ordinal()),
|
||||
list);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.SILKY.ordinal()),
|
||||
list.copy().add(Aspect.SLIME, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.PULSATING.ordinal()),
|
||||
list.copy().add(Aspect.ELDRITCH, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.UNSTABLE.ordinal()),
|
||||
list.copy().add(Aspect.ENTROPY, 1).add(Aspect.EXCHANGE, 1));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.AIR.ordinal()),
|
||||
list.copy().add(Aspect.AIR, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.WATER.ordinal()),
|
||||
list.copy().add(Aspect.WATER, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.FIRE.ordinal()),
|
||||
list.copy().add(Aspect.FIRE, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.EARTH.ordinal()),
|
||||
list.copy().add(Aspect.EARTH, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.ORDER.ordinal()),
|
||||
list.copy().add(Aspect.ORDER, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.CHAOS.ordinal()),
|
||||
list.copy().add(Aspect.ENTROPY, 2));
|
||||
|
||||
list = new AspectList().add(Aspect.PLANT, 2);
|
||||
item = forestry.api.core.ItemInterface.getItem("pollen");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, ForestryHelper.Pollen.NORMAL.ordinal(), list);
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, ForestryHelper.Pollen.CRYSTALLINE.ordinal(), list.copy().add(Aspect.ICE, 2));
|
||||
ThaumcraftApi.registerObjectTag(Config.pollen.itemID, PollenType.UNUSUAL.ordinal(), list.copy().add(Aspect.MAGIC, 2));
|
||||
ThaumcraftApi.registerObjectTag(Config.pollen.itemID, PollenType.PHASED.ordinal(), list.copy().add((Aspect)aspectTime, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Pollen.NORMAL.ordinal()), list);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()),
|
||||
list.copy()/*.add(Aspect.ICE, 2)*/);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.pollen, 1, PollenType.UNUSUAL.ordinal()),
|
||||
list.copy().add(Aspect.MAGIC, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.pollen, 1, PollenType.PHASED.ordinal()),
|
||||
list.copy().add((Aspect)aspectTime, 2));
|
||||
|
||||
list = new AspectList().add(Aspect.ORDER, 1);
|
||||
item = forestry.api.core.ItemInterface.getItem("beeswax");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), list.copy().add(Aspect.ORDER, 2));
|
||||
ThaumcraftApi.registerObjectTag(Config.wax.itemID, WaxType.MAGIC.ordinal(), list.copy().add(Aspect.MAGIC, 2));
|
||||
ThaumcraftApi.registerObjectTag(Config.wax.itemID, WaxType.SOUL.ordinal(), list.copy().add(Aspect.SOUL, 2));
|
||||
ThaumcraftApi.registerObjectTag(Config.wax.itemID, WaxType.AMNESIC.ordinal(), list.copy().add(Aspect.MIND, 2));
|
||||
ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list.copy().add(Aspect.ORDER,
|
||||
2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.wax, 1, WaxType.MAGIC.ordinal()),
|
||||
list.copy().add(Aspect.MAGIC, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.wax, 1, WaxType.SOUL.ordinal()),
|
||||
list.copy().add(Aspect.SOUL, 2));
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(Config.wax, 1, WaxType.AMNESIC.ordinal()),
|
||||
list.copy().add(Aspect.MIND, 2));
|
||||
|
||||
list = new AspectList().add(Aspect.EXCHANGE, 2).add(Aspect.LIFE, 2);
|
||||
item = forestry.api.core.ItemInterface.getItem("honeyDrop");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), list);
|
||||
ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list);
|
||||
|
||||
list = new AspectList().add(Aspect.LIFE, 2).add(Aspect.ENERGY, 2);
|
||||
item = forestry.api.core.ItemInterface.getItem("honeydew");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), list);
|
||||
ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list);
|
||||
|
||||
list = new AspectList().add(Aspect.GREED, 1).add(Aspect.LIFE, 4);
|
||||
item = forestry.api.core.ItemInterface.getItem("royalJelly");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), list);
|
||||
ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list);
|
||||
|
||||
list = new AspectList().add(Aspect.FIRE, 1).add(Aspect.TRAP, 2);
|
||||
item = forestry.api.core.ItemInterface.getItem("phosphor");
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), list);
|
||||
ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list);
|
||||
|
||||
item = Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE);
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), new AspectList().add(Aspect.LIFE, 6));
|
||||
ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, new AspectList().add(Aspect.LIFE, 6));
|
||||
|
||||
item = Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE);
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), new AspectList().add(Aspect.DEATH, 6));
|
||||
ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, new AspectList().add(Aspect.DEATH, 6));
|
||||
|
||||
item = Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY);
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), new AspectList().add(Aspect.ARMOR, 6));
|
||||
ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, new AspectList().add(Aspect.ARMOR, 6));
|
||||
|
||||
item = Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME);
|
||||
ThaumcraftApi.registerObjectTag(item.itemID, item.getItemDamage(), new AspectList().add(Aspect.VOID, 6).add((Aspect)aspectTime, 8 ));
|
||||
ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, new AspectList().add(Aspect.VOID,
|
||||
6).add((Aspect)aspectTime, 8 ));
|
||||
}
|
||||
}
|
||||
+13
-28
@@ -1,27 +1,12 @@
|
||||
package magicbees.main.utils.compat;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import magicbees.item.types.PollenType;
|
||||
import magicbees.item.types.PropolisType;
|
||||
import magicbees.item.types.ResourceType;
|
||||
import magicbees.item.types.WaxType;
|
||||
import magicbees.item.types.DropType;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.MagicBees;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.item.crafting.ShapelessRecipes;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import forestry.api.core.ItemInterface;
|
||||
import net.minecraftforge.fluids.*;
|
||||
import magicbees.item.types.DropType;
|
||||
import magicbees.main.Config;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
|
||||
public class ThermalExpansionHelper
|
||||
{
|
||||
@@ -99,8 +84,8 @@ public class ThermalExpansionHelper
|
||||
|
||||
NBTTagCompound toSend = new NBTTagCompound();
|
||||
toSend.setInteger("energy", 4000);
|
||||
toSend.setCompoundTag("input", new NBTTagCompound());
|
||||
toSend.setCompoundTag("output", new NBTTagCompound());
|
||||
toSend.setTag("input", new NBTTagCompound());
|
||||
toSend.setTag("output", new NBTTagCompound());
|
||||
|
||||
carbonDrop.writeToNBT(toSend.getCompoundTag("input"));
|
||||
Config.teFluidCoal.writeToNBT(toSend.getCompoundTag("output"));
|
||||
@@ -112,8 +97,8 @@ public class ThermalExpansionHelper
|
||||
|
||||
toSend = new NBTTagCompound();
|
||||
toSend.setInteger("energy", 4000);
|
||||
toSend.setCompoundTag("input", new NBTTagCompound());
|
||||
toSend.setCompoundTag("output", new NBTTagCompound());
|
||||
toSend.setTag("input", new NBTTagCompound());
|
||||
toSend.setTag("output", new NBTTagCompound());
|
||||
|
||||
destabilizedDrop.writeToNBT(toSend.getCompoundTag("input"));
|
||||
Config.teFluidRedstone.writeToNBT(toSend.getCompoundTag("output"));
|
||||
@@ -125,8 +110,8 @@ public class ThermalExpansionHelper
|
||||
|
||||
toSend = new NBTTagCompound();
|
||||
toSend.setInteger("energy", 4000);
|
||||
toSend.setCompoundTag("input", new NBTTagCompound());
|
||||
toSend.setCompoundTag("output", new NBTTagCompound());
|
||||
toSend.setTag("input", new NBTTagCompound());
|
||||
toSend.setTag("output", new NBTTagCompound());
|
||||
|
||||
endearingDrop.writeToNBT(toSend.getCompoundTag("input"));
|
||||
Config.teFluidEnder.writeToNBT(toSend.getCompoundTag("output"));
|
||||
@@ -138,8 +123,8 @@ public class ThermalExpansionHelper
|
||||
|
||||
toSend = new NBTTagCompound();
|
||||
toSend.setInteger("energy", 4000);
|
||||
toSend.setCompoundTag("input", new NBTTagCompound());
|
||||
toSend.setCompoundTag("output", new NBTTagCompound());
|
||||
toSend.setTag("input", new NBTTagCompound());
|
||||
toSend.setTag("output", new NBTTagCompound());
|
||||
|
||||
luxDrop.writeToNBT(toSend.getCompoundTag("input"));
|
||||
Config.teFluidGlowstone.writeToNBT(toSend.getCompoundTag("output"));
|
||||
+1
-1
@@ -76,7 +76,7 @@ public class BackpackDefinition implements IBackpackDefinition
|
||||
{
|
||||
stack = this.items.get(i);
|
||||
// If comparison stack has meta of -1
|
||||
if (stack.itemID == itemStack.itemID)
|
||||
if (stack.getItem() == itemStack.getItem())
|
||||
{
|
||||
flag = stack.getItemDamage() == -1 || stack.getItemDamage() == itemStack.getItemDamage();
|
||||
}
|
||||
+2
-2
@@ -137,7 +137,7 @@ public class EffectJarHousing implements IBeeHousing
|
||||
@Override
|
||||
public int getBiomeId()
|
||||
{
|
||||
return this.jarEntity.worldObj.getBiomeGenForCoords(getXCoord(), getYCoord()).biomeID;
|
||||
return this.jarEntity.getWorldObj().getBiomeGenForCoords(getXCoord(), getYCoord()).biomeID;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -169,7 +169,7 @@ public class EffectJarHousing implements IBeeHousing
|
||||
@Override
|
||||
public World getWorld()
|
||||
{
|
||||
return this.jarEntity.worldObj;
|
||||
return this.jarEntity.getWorldObj();
|
||||
}
|
||||
|
||||
@Override
|
||||
+15
-13
@@ -10,6 +10,7 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.genetics.IEffectData;
|
||||
import net.minecraftforge.common.util.Constants;
|
||||
|
||||
public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
{
|
||||
@@ -37,7 +38,7 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
|
||||
public void setOwner(EntityPlayer player)
|
||||
{
|
||||
this.ownerName = player.username;
|
||||
this.ownerName = player.getCommandSenderName();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -97,7 +98,7 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
{
|
||||
queen.writeToNBT(this.beeSlots[QUEEN_SLOT].stackTagCompound);
|
||||
}
|
||||
this.onInventoryChanged();
|
||||
this.markDirty();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -128,7 +129,7 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
currentBeeHealth = (current * 100) / max;
|
||||
currentBeeColour = ((IAlleleBeeSpecies)bee.getGenome().getPrimary()).getIconColour(0);
|
||||
}
|
||||
this.onInventoryChanged();
|
||||
this.markDirty();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -146,7 +147,7 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
this.beeSlots[slot] = null;
|
||||
}
|
||||
}
|
||||
onInventoryChanged();
|
||||
markDirty();
|
||||
return value;
|
||||
}
|
||||
|
||||
@@ -159,7 +160,7 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
value = this.beeSlots[slot];
|
||||
this.beeSlots[slot] = null;
|
||||
}
|
||||
onInventoryChanged();
|
||||
markDirty();
|
||||
return value;
|
||||
}
|
||||
|
||||
@@ -168,12 +169,12 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
{
|
||||
super.readFromNBT(tagRoot);
|
||||
|
||||
NBTTagList nbttaglist = tagRoot.getTagList("Items");
|
||||
NBTTagList nbttaglist = tagRoot.getTagList("Items", Constants.NBT.TAG_COMPOUND);
|
||||
this.beeSlots = new ItemStack[SLOT_COUNT];
|
||||
|
||||
for (int i = 0; i < nbttaglist.tagCount(); ++i)
|
||||
{
|
||||
NBTTagCompound nbttagcompound1 = (NBTTagCompound)nbttaglist.tagAt(i);
|
||||
NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i);
|
||||
byte b0 = nbttagcompound1.getByte("Slot");
|
||||
|
||||
if (b0 >= 0 && b0 < this.beeSlots.length)
|
||||
@@ -212,19 +213,20 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
this.beeSlots[slot] = itemStack;
|
||||
if (this.beeSlots[slot] != null)
|
||||
{
|
||||
this.beeSlots[slot].stackSize = Math.min(this.beeSlots[slot].stackSize, this.beeSlots[slot].getItem().getItemStackLimit());
|
||||
this.beeSlots[slot].stackSize = Math.min(this.beeSlots[slot].stackSize,
|
||||
this.beeSlots[slot].getItem().getItemStackLimit(this.beeSlots[slot]));
|
||||
}
|
||||
onInventoryChanged();
|
||||
this.markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInvName()
|
||||
public String getInventoryName()
|
||||
{
|
||||
return "container.effectJar";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isInvNameLocalized()
|
||||
public boolean hasCustomInventoryName()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -248,8 +250,8 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openChest() { }
|
||||
public void openInventory() { }
|
||||
|
||||
@Override
|
||||
public void closeChest() { }
|
||||
public void closeInventory() { }
|
||||
}
|
||||
Loaded 100 of 227 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user