mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 13:09:47 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
793ae95776 | ||
|
|
2324dc37e8 | ||
|
|
4beab15846 | ||
|
|
7e331c0bd8 | ||
|
|
31a4e593b3 | ||
|
|
2e159f1983 | ||
|
|
7029d05c65 | ||
|
|
dde6c79f9e | ||
|
|
577a198cb6 | ||
|
|
d6f724dd23 | ||
|
|
938e33bfab | ||
|
|
6478c25ea7 | ||
|
|
2ce1328e3b | ||
|
|
03614866a4 | ||
|
|
60605d06c1 | ||
|
|
7c8d913724 | ||
|
|
718f0661df | ||
|
|
a936e2fa64 | ||
|
|
fb8edb5738 | ||
|
|
5f5dcda1a0 |
No files matched your search
+4
-4
@@ -1,12 +1,12 @@
|
|||||||
// Add your dependencies here
|
// Add your dependencies here
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
|
api('com.github.GTNewHorizons:ForestryMC:4.11.0:dev')
|
||||||
implementation('com.github.GTNewHorizons:GTNHLib:0.7.0:dev')
|
implementation('com.github.GTNewHorizons:GTNHLib:0.7.3:dev')
|
||||||
|
|
||||||
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.0-GTNH:dev')
|
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.26-GTNH:dev')
|
||||||
|
|
||||||
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
|
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api')
|
||||||
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
|
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
|
||||||
compileOnly("curse.maven:extrabiomesxl-60041:2273301")
|
compileOnly("curse.maven:extrabiomesxl-60041:2273301")
|
||||||
}
|
}
|
||||||
+13
-1
@@ -43,6 +43,10 @@ developmentEnvironmentUserName = Developer
|
|||||||
# See https://github.com/bsideup/jabel for details on how this works.
|
# See https://github.com/bsideup/jabel for details on how this works.
|
||||||
enableModernJavaSyntax = true
|
enableModernJavaSyntax = true
|
||||||
|
|
||||||
|
# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
|
||||||
|
# and should *not* be used in most situations. -1 disables this.
|
||||||
|
# forceToolchainVersion = -1
|
||||||
|
|
||||||
# Enables injecting missing generics into the decompiled source code for a better coding experience.
|
# Enables injecting missing generics into the decompiled source code for a better coding experience.
|
||||||
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
|
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
|
||||||
enableGenericInjection = true
|
enableGenericInjection = true
|
||||||
@@ -96,7 +100,9 @@ usesMixinDebug = false
|
|||||||
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
|
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
|
||||||
mixinPlugin =
|
mixinPlugin =
|
||||||
|
|
||||||
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
|
# Specify the package that contains all of your Mixins. The package must exist or
|
||||||
|
# the build will fail. If you have a package property defined in your mixins.<modid>.json,
|
||||||
|
# it must match with this or the build will fail.
|
||||||
mixinsPackage =
|
mixinsPackage =
|
||||||
|
|
||||||
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
|
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
|
||||||
@@ -172,6 +178,12 @@ curseForgeRelations =
|
|||||||
# projects. New projects should not use this parameter.
|
# projects. New projects should not use this parameter.
|
||||||
customArchiveBaseName = binnie-mods
|
customArchiveBaseName = binnie-mods
|
||||||
|
|
||||||
|
# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
|
||||||
|
# runClientWorkingDirectory = run/client
|
||||||
|
|
||||||
|
# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
|
||||||
|
# runServerWorkingDirectory = run/server
|
||||||
|
|
||||||
# Optional parameter to have the build automatically fail if an illegal version is used.
|
# Optional parameter to have the build automatically fail if an illegal version is used.
|
||||||
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
|
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
|
||||||
# The check is ONLY performed if the version is a git tag.
|
# The check is ONLY performed if the version is a git tag.
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
#This file is generated by updateDaemonJvm
|
||||||
|
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
|
||||||
|
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
|
||||||
|
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
|
||||||
|
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
|
||||||
|
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e1118b4c7c2858d28154d086dbff010e/redirect
|
||||||
|
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/redirect
|
||||||
|
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
|
||||||
|
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
|
||||||
|
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/832229f0f6f0be60ed817c5a5e5848eb/redirect
|
||||||
|
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b96cb7670c095245220e7d01d5927b58/redirect
|
||||||
|
toolchainVersion=25
|
||||||
Vendored
BIN
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright © 2015-2021 the original authors.
|
# Copyright © 2015 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -114,7 +114,6 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -172,7 +171,6 @@ fi
|
|||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
if "$cygwin" || "$msys" ; then
|
if "$cygwin" || "$msys" ; then
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-classpath "$CLASSPATH" \
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
# Stop when "xargs" is not available.
|
||||||
|
|||||||
Vendored
+1
-2
@@ -70,11 +70,10 @@ goto fail
|
|||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
|||||||
+1
-1
@@ -17,5 +17,5 @@ pluginManagement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43'
|
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.6'
|
||||||
}
|
}
|
||||||
@@ -5,7 +5,6 @@ import java.util.List;
|
|||||||
|
|
||||||
import binnie.core.ManagerBase;
|
import binnie.core.ManagerBase;
|
||||||
import binnie.core.genetics.ManagerGenetics;
|
import binnie.core.genetics.ManagerGenetics;
|
||||||
import binnie.core.item.ManagerItem;
|
|
||||||
import binnie.core.liquid.ManagerLiquid;
|
import binnie.core.liquid.ManagerLiquid;
|
||||||
import binnie.core.machines.ManagerMachine;
|
import binnie.core.machines.ManagerMachine;
|
||||||
import binnie.core.resource.ManagerResource;
|
import binnie.core.resource.ManagerResource;
|
||||||
@@ -16,6 +15,5 @@ public final class Binnie {
|
|||||||
public static ManagerGenetics Genetics = new ManagerGenetics();
|
public static ManagerGenetics Genetics = new ManagerGenetics();
|
||||||
public static ManagerLiquid Liquid = new ManagerLiquid();
|
public static ManagerLiquid Liquid = new ManagerLiquid();
|
||||||
public static ManagerMachine Machine = new ManagerMachine();
|
public static ManagerMachine Machine = new ManagerMachine();
|
||||||
public static ManagerItem Item = new ManagerItem();
|
|
||||||
public static ManagerResource Resource = new ManagerResource();
|
public static ManagerResource Resource = new ManagerResource();
|
||||||
}
|
}
|
||||||
@@ -64,32 +64,37 @@ public class Botany extends AbstractMod {
|
|||||||
@SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
|
@SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
|
||||||
public static Proxy proxy;
|
public static Proxy proxy;
|
||||||
|
|
||||||
|
// Genetics module
|
||||||
public static BlockFlower flower;
|
public static BlockFlower flower;
|
||||||
public static Item seed;
|
|
||||||
|
public static ItemFlower flowerItem;
|
||||||
public static Item pollen;
|
public static Item pollen;
|
||||||
|
public static Item seed;
|
||||||
public static ItemDictionary database;
|
public static ItemDictionary database;
|
||||||
|
|
||||||
|
// Gardening module
|
||||||
public static BlockPlant plant;
|
public static BlockPlant plant;
|
||||||
public static ItemTrowel trowelWood;
|
|
||||||
public static ItemTrowel trowelStone;
|
|
||||||
public static ItemTrowel trowelIron;
|
|
||||||
public static ItemTrowel trowelDiamond;
|
|
||||||
public static ItemTrowel trowelGold;
|
|
||||||
public static BlockSoil soil;
|
public static BlockSoil soil;
|
||||||
public static BlockSoil loam;
|
public static BlockSoil loam;
|
||||||
public static BlockSoil flowerbed;
|
public static BlockSoil flowerbed;
|
||||||
public static BlockSoil soilNoWeed;
|
public static BlockSoil soilNoWeed;
|
||||||
public static BlockSoil loamNoWeed;
|
public static BlockSoil loamNoWeed;
|
||||||
public static BlockSoil flowerbedNoWeed;
|
public static BlockSoil flowerbedNoWeed;
|
||||||
public static ItemInsulatedTube insulatedTube;
|
public static BlockCeramic ceramic;
|
||||||
|
public static BlockStained stained;
|
||||||
|
public static BlockCeramicPatterned ceramicTile;
|
||||||
|
public static BlockCeramicBrick ceramicBrick;
|
||||||
|
|
||||||
public static ItemSoilMeter soilMeter;
|
public static ItemSoilMeter soilMeter;
|
||||||
|
public static ItemInsulatedTube insulatedTube;
|
||||||
|
public static ItemTrowel trowelWood;
|
||||||
|
public static ItemTrowel trowelStone;
|
||||||
|
public static ItemTrowel trowelIron;
|
||||||
|
public static ItemTrowel trowelDiamond;
|
||||||
|
public static ItemTrowel trowelGold;
|
||||||
public static ItemMisc misc;
|
public static ItemMisc misc;
|
||||||
public static ItemFlower flowerItem;
|
|
||||||
public static ItemPigment pigment;
|
public static ItemPigment pigment;
|
||||||
public static ItemClay clay;
|
public static ItemClay clay;
|
||||||
public static BlockCeramic ceramic;
|
|
||||||
public static BlockCeramicPatterned ceramicTile;
|
|
||||||
public static BlockStained stained;
|
|
||||||
public static BlockCeramicBrick ceramicBrick;
|
|
||||||
|
|
||||||
public Botany() {
|
public Botany() {
|
||||||
Botany.instance = this;
|
Botany.instance = this;
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.botany.flower;
|
package binnie.botany.flower;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
@@ -39,6 +41,8 @@ public abstract class ItemBotany extends Item {
|
|||||||
setCreativeTab(CreativeTabBotany.instance);
|
setCreativeTab(CreativeTabBotany.instance);
|
||||||
setUnlocalizedName(name);
|
setUnlocalizedName(name);
|
||||||
hasSubtypes = true;
|
hasSubtypes = true;
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.botany.flower;
|
package binnie.botany.flower;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -25,6 +27,8 @@ public class ItemInsulatedTube extends Item {
|
|||||||
setUnlocalizedName("insulatedTube");
|
setUnlocalizedName("insulatedTube");
|
||||||
setCreativeTab(CreativeTabBotany.instance);
|
setCreativeTab(CreativeTabBotany.instance);
|
||||||
setHasSubtypes(true);
|
setHasSubtypes(true);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack getInsulateStack(ItemStack stack) {
|
public static ItemStack getInsulateStack(ItemStack stack) {
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.botany.gardening;
|
package binnie.botany.gardening;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
@@ -28,6 +30,8 @@ public class ItemSoilMeter extends Item {
|
|||||||
setCreativeTab(CreativeTabBotany.instance);
|
setCreativeTab(CreativeTabBotany.instance);
|
||||||
setUnlocalizedName("soilMeter");
|
setUnlocalizedName("soilMeter");
|
||||||
setMaxStackSize(1);
|
setMaxStackSize(1);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.botany.gardening;
|
package binnie.botany.gardening;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
@@ -28,6 +30,8 @@ public class ItemTrowel extends Item {
|
|||||||
setCreativeTab(CreativeTabBotany.instance);
|
setCreativeTab(CreativeTabBotany.instance);
|
||||||
setUnlocalizedName("trowel" + material);
|
setUnlocalizedName("trowel" + material);
|
||||||
locName = "trowel" + material;
|
locName = "trowel" + material;
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import net.minecraftforge.oredict.RecipeSorter;
|
|||||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||||
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||||
|
|
||||||
import binnie.Binnie;
|
|
||||||
import binnie.botany.Botany;
|
import binnie.botany.Botany;
|
||||||
import binnie.botany.CreativeTabBotany;
|
import binnie.botany.CreativeTabBotany;
|
||||||
import binnie.botany.api.EnumAcidity;
|
import binnie.botany.api.EnumAcidity;
|
||||||
@@ -37,6 +36,7 @@ import binnie.core.block.ItemMetadata;
|
|||||||
import binnie.core.block.ItemMetadataRenderer;
|
import binnie.core.block.ItemMetadataRenderer;
|
||||||
import binnie.core.block.MultipassItemRenderer;
|
import binnie.core.block.MultipassItemRenderer;
|
||||||
import binnie.core.block.TileEntityMetadata;
|
import binnie.core.block.TileEntityMetadata;
|
||||||
|
import binnie.core.item.ItemMisc;
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
|
|
||||||
public class ModuleGardening implements IInitializable {
|
public class ModuleGardening implements IInitializable {
|
||||||
@@ -75,7 +75,7 @@ public class ModuleGardening implements IInitializable {
|
|||||||
Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron");
|
Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron");
|
||||||
Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond");
|
Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond");
|
||||||
Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold");
|
Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold");
|
||||||
Botany.misc = Binnie.Item.registerMiscItems(BotanyItems.values(), CreativeTabBotany.instance);
|
Botany.misc = new ItemMisc(CreativeTabBotany.instance, BotanyItems.values());
|
||||||
Botany.pigment = new ItemPigment();
|
Botany.pigment = new ItemPigment();
|
||||||
Botany.clay = new ItemClay();
|
Botany.clay = new ItemClay();
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.botany.genetics;
|
package binnie.botany.genetics;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -25,6 +27,8 @@ public class ItemDictionary extends Item {
|
|||||||
setCreativeTab(CreativeTabBotany.instance);
|
setCreativeTab(CreativeTabBotany.instance);
|
||||||
setUnlocalizedName("database");
|
setUnlocalizedName("database");
|
||||||
setMaxStackSize(1);
|
setMaxStackSize(1);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.botany.items;
|
package binnie.botany.items;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -22,6 +24,8 @@ public class ItemClay extends Item {
|
|||||||
setUnlocalizedName("clay");
|
setUnlocalizedName("clay");
|
||||||
setHasSubtypes(true);
|
setHasSubtypes(true);
|
||||||
setCreativeTab(CreativeTabBotany.instance);
|
setCreativeTab(CreativeTabBotany.instance);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.botany.items;
|
package binnie.botany.items;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -22,6 +24,8 @@ public class ItemPigment extends Item {
|
|||||||
setUnlocalizedName("pigment");
|
setUnlocalizedName("pigment");
|
||||||
setHasSubtypes(true);
|
setHasSubtypes(true);
|
||||||
setCreativeTab(CreativeTabBotany.instance);
|
setCreativeTab(CreativeTabBotany.instance);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,13 +1,9 @@
|
|||||||
package binnie.core;
|
package binnie.core;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.LinkedHashSet;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import binnie.core.gui.IBinnieGUID;
|
import binnie.core.gui.IBinnieGUID;
|
||||||
import binnie.core.mod.parser.FieldParser;
|
|
||||||
import binnie.core.network.BinniePacketHandler;
|
import binnie.core.network.BinniePacketHandler;
|
||||||
import binnie.core.network.IPacketID;
|
import binnie.core.network.IPacketID;
|
||||||
import binnie.core.network.IPacketProvider;
|
import binnie.core.network.IPacketProvider;
|
||||||
@@ -20,11 +16,9 @@ import cpw.mods.fml.relauncher.Side;
|
|||||||
public abstract class AbstractMod implements IPacketProvider, IInitializable {
|
public abstract class AbstractMod implements IPacketProvider, IInitializable {
|
||||||
|
|
||||||
private SimpleNetworkWrapper wrapper;
|
private SimpleNetworkWrapper wrapper;
|
||||||
private final LinkedHashSet<Field> fields;
|
|
||||||
protected final List<IInitializable> modules;
|
protected final List<IInitializable> modules;
|
||||||
|
|
||||||
public AbstractMod() {
|
public AbstractMod() {
|
||||||
fields = new LinkedHashSet<>();
|
|
||||||
modules = new ArrayList<>();
|
modules = new ArrayList<>();
|
||||||
BinnieCore.registerMod(this);
|
BinnieCore.registerMod(this);
|
||||||
}
|
}
|
||||||
@@ -65,22 +59,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
|
|||||||
for (IInitializable module : modules) {
|
for (IInitializable module : modules) {
|
||||||
module.preInit();
|
module.preInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO what does it mean?
|
|
||||||
Collections.addAll(fields, getClass().getFields());
|
|
||||||
for (Class<?> cls : getClass().getClasses()) {
|
|
||||||
Collections.addAll(fields, getClass().getFields());
|
|
||||||
}
|
|
||||||
for (IInitializable module : modules) {
|
|
||||||
Collections.addAll(fields, module.getClass().getFields());
|
|
||||||
}
|
|
||||||
for (Field field4 : fields) {
|
|
||||||
try {
|
|
||||||
FieldParser.preInitParse(field4, this);
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -96,14 +74,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
|
|||||||
for (IInitializable module : modules) {
|
for (IInitializable module : modules) {
|
||||||
module.init();
|
module.init();
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Field field : fields) {
|
|
||||||
try {
|
|
||||||
FieldParser.initParse(field, this);
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -116,14 +86,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
|
|||||||
for (IInitializable module : modules) {
|
for (IInitializable module : modules) {
|
||||||
module.postInit();
|
module.postInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Field field : fields) {
|
|
||||||
try {
|
|
||||||
FieldParser.postInitParse(field, this);
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void addModule(IInitializable init) {
|
protected void addModule(IInitializable init) {
|
||||||
|
|||||||
@@ -22,8 +22,6 @@ import binnie.core.liquid.FluidContainer;
|
|||||||
import binnie.core.liquid.ItemFluidContainer;
|
import binnie.core.liquid.ItemFluidContainer;
|
||||||
import binnie.core.machines.MachineGroup;
|
import binnie.core.machines.MachineGroup;
|
||||||
import binnie.core.machines.storage.ModuleStorage;
|
import binnie.core.machines.storage.ModuleStorage;
|
||||||
import binnie.core.mod.parser.FieldParser;
|
|
||||||
import binnie.core.mod.parser.ItemParser;
|
|
||||||
import binnie.core.network.BinnieCorePacketID;
|
import binnie.core.network.BinnieCorePacketID;
|
||||||
import binnie.core.network.BinniePacketHandler;
|
import binnie.core.network.BinniePacketHandler;
|
||||||
import binnie.core.network.IPacketID;
|
import binnie.core.network.IPacketID;
|
||||||
@@ -110,7 +108,6 @@ public class BinnieCore extends AbstractMod {
|
|||||||
Item item = new ItemFluidContainer(container);
|
Item item = new ItemFluidContainer(container);
|
||||||
GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
|
GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
FieldParser.parsers.add(new ItemParser());
|
|
||||||
super.preInit();
|
super.preInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.core.item;
|
package binnie.core.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
@@ -25,6 +27,8 @@ public class ItemGenesis extends Item {
|
|||||||
setCreativeTab(Tabs.tabApiculture);
|
setCreativeTab(Tabs.tabApiculture);
|
||||||
setUnlocalizedName("genesis");
|
setUnlocalizedName("genesis");
|
||||||
setMaxStackSize(1);
|
setMaxStackSize(1);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.core.item;
|
package binnie.core.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -16,11 +18,13 @@ public class ItemMisc extends Item {
|
|||||||
|
|
||||||
private final IItemMisc[] items;
|
private final IItemMisc[] items;
|
||||||
|
|
||||||
protected ItemMisc(CreativeTabs tab, IItemMisc[] items2) {
|
public ItemMisc(CreativeTabs tab, IItemMisc[] items) {
|
||||||
setCreativeTab(tab);
|
setCreativeTab(tab);
|
||||||
setHasSubtypes(true);
|
setHasSubtypes(true);
|
||||||
setUnlocalizedName("misc");
|
setUnlocalizedName("misc");
|
||||||
items = items2;
|
this.items = items;
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
package binnie.core.item;
|
|
||||||
|
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
|
||||||
|
|
||||||
public class ManagerItem {
|
|
||||||
|
|
||||||
public ItemMisc registerMiscItems(IItemMisc[] items, CreativeTabs tab) {
|
|
||||||
return new ItemMisc(tab, items);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -9,4 +9,11 @@ public interface IProcess extends IErrorStateSource {
|
|||||||
boolean isInProgress();
|
boolean isInProgress();
|
||||||
|
|
||||||
ProcessInfo getInfo();
|
ProcessInfo getInfo();
|
||||||
|
|
||||||
|
/***
|
||||||
|
* Returns true if the current target got worked on at least once.
|
||||||
|
*/
|
||||||
|
default boolean workedOnTarget() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
package binnie.core.mod.parser;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import binnie.core.AbstractMod;
|
|
||||||
|
|
||||||
public abstract class FieldParser {
|
|
||||||
|
|
||||||
public static Collection<FieldParser> parsers = new ArrayList<>();
|
|
||||||
|
|
||||||
public abstract boolean isHandled(Field field, AbstractMod mod);
|
|
||||||
|
|
||||||
public void preInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
|
|
||||||
// ignored
|
|
||||||
}
|
|
||||||
|
|
||||||
public void init(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
|
|
||||||
// ignored
|
|
||||||
}
|
|
||||||
|
|
||||||
public void postInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
|
|
||||||
// ignored
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void preInitParse(Field field, AbstractMod mod)
|
|
||||||
throws IllegalArgumentException, IllegalAccessException {
|
|
||||||
for (FieldParser parser : FieldParser.parsers) {
|
|
||||||
if (parser.isHandled(field, mod)) {
|
|
||||||
parser.preInit(field, mod);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void initParse(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
|
|
||||||
for (FieldParser parser : FieldParser.parsers) {
|
|
||||||
if (parser.isHandled(field, mod)) {
|
|
||||||
parser.init(field, mod);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void postInitParse(Field field, AbstractMod mod)
|
|
||||||
throws IllegalArgumentException, IllegalAccessException {
|
|
||||||
for (FieldParser parser : FieldParser.parsers) {
|
|
||||||
if (parser.isHandled(field, mod)) {
|
|
||||||
parser.postInit(field, mod);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
package binnie.core.mod.parser;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
|
|
||||||
import binnie.core.AbstractMod;
|
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
|
||||||
|
|
||||||
public class ItemParser extends FieldParser {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isHandled(Field field, AbstractMod mod) {
|
|
||||||
return Item.class.isAssignableFrom(field.getType());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void preInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
|
|
||||||
Item item = (Item) field.get(null);
|
|
||||||
if (item != null) {
|
|
||||||
GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,7 +2,6 @@ package binnie.extrabees;
|
|||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.item.Item;
|
|
||||||
|
|
||||||
import com.gtnewhorizon.gtnhlib.config.ConfigException;
|
import com.gtnewhorizon.gtnhlib.config.ConfigException;
|
||||||
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
|
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
|
||||||
@@ -11,6 +10,7 @@ import binnie.core.AbstractMod;
|
|||||||
import binnie.core.BinnieCore;
|
import binnie.core.BinnieCore;
|
||||||
import binnie.core.Tags;
|
import binnie.core.Tags;
|
||||||
import binnie.core.gui.IBinnieGUID;
|
import binnie.core.gui.IBinnieGUID;
|
||||||
|
import binnie.core.item.ItemMisc;
|
||||||
import binnie.core.network.BinniePacketHandler;
|
import binnie.core.network.BinniePacketHandler;
|
||||||
import binnie.core.proxy.IProxyCore;
|
import binnie.core.proxy.IProxyCore;
|
||||||
import binnie.extrabees.apiary.ModuleApiary;
|
import binnie.extrabees.apiary.ModuleApiary;
|
||||||
@@ -18,7 +18,11 @@ import binnie.extrabees.config.EBConfig;
|
|||||||
import binnie.extrabees.core.ExtraBeeGUID;
|
import binnie.extrabees.core.ExtraBeeGUID;
|
||||||
import binnie.extrabees.core.ModuleCore;
|
import binnie.extrabees.core.ModuleCore;
|
||||||
import binnie.extrabees.genetics.ModuleGenetics;
|
import binnie.extrabees.genetics.ModuleGenetics;
|
||||||
|
import binnie.extrabees.genetics.items.ItemDictionary;
|
||||||
import binnie.extrabees.liquids.ModuleLiquids;
|
import binnie.extrabees.liquids.ModuleLiquids;
|
||||||
|
import binnie.extrabees.products.ItemHoneyComb;
|
||||||
|
import binnie.extrabees.products.ItemHoneyDrop;
|
||||||
|
import binnie.extrabees.products.ItemPropolis;
|
||||||
import binnie.extrabees.products.ModuleProducts;
|
import binnie.extrabees.products.ModuleProducts;
|
||||||
import binnie.extrabees.proxy.ExtraBeesProxy;
|
import binnie.extrabees.proxy.ExtraBeesProxy;
|
||||||
import binnie.extrabees.worldgen.ModuleGeneration;
|
import binnie.extrabees.worldgen.ModuleGeneration;
|
||||||
@@ -58,11 +62,11 @@ public class ExtraBees extends AbstractMod {
|
|||||||
public static Block hive;
|
public static Block hive;
|
||||||
public static Material materialBeehive;
|
public static Material materialBeehive;
|
||||||
public static Block ectoplasm;
|
public static Block ectoplasm;
|
||||||
public static Item comb;
|
public static ItemHoneyComb comb;
|
||||||
public static Item propolis;
|
public static ItemPropolis propolis;
|
||||||
public static Item honeyDrop;
|
public static ItemHoneyDrop honeyDrop;
|
||||||
public static Item dictionary;
|
public static ItemDictionary dictionary;
|
||||||
public static Item itemMisc;
|
public static ItemMisc itemMisc;
|
||||||
|
|
||||||
public ExtraBees() {
|
public ExtraBees() {
|
||||||
ExtraBees.instance = this;
|
ExtraBees.instance = this;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package binnie.extrabees.core;
|
package binnie.extrabees.core;
|
||||||
|
|
||||||
import binnie.Binnie;
|
|
||||||
import binnie.core.IInitializable;
|
import binnie.core.IInitializable;
|
||||||
|
import binnie.core.item.ItemMisc;
|
||||||
import binnie.extrabees.ExtraBees;
|
import binnie.extrabees.ExtraBees;
|
||||||
import forestry.api.core.Tabs;
|
import forestry.api.core.Tabs;
|
||||||
|
|
||||||
@@ -9,7 +9,7 @@ public class ModuleCore implements IInitializable {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void preInit() {
|
public void preInit() {
|
||||||
ExtraBees.itemMisc = Binnie.Item.registerMiscItems(ExtraBeeItems.values(), Tabs.tabApiculture);
|
ExtraBees.itemMisc = new ItemMisc(Tabs.tabApiculture, ExtraBeeItems.values());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.extrabees.genetics.items;
|
package binnie.extrabees.genetics.items;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -25,6 +27,8 @@ public class ItemDictionary extends Item {
|
|||||||
setCreativeTab(Tabs.tabApiculture);
|
setCreativeTab(Tabs.tabApiculture);
|
||||||
setUnlocalizedName("dictionary");
|
setUnlocalizedName("dictionary");
|
||||||
setMaxStackSize(1);
|
setMaxStackSize(1);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -21,9 +21,8 @@ public class ItemHoneyComb extends ItemProduct {
|
|||||||
protected IIcon icon2;
|
protected IIcon icon2;
|
||||||
|
|
||||||
public ItemHoneyComb() {
|
public ItemHoneyComb() {
|
||||||
super(EnumHoneyComb.values());
|
super("honeyComb", EnumHoneyComb.values());
|
||||||
setCreativeTab(Tabs.tabApiculture);
|
setCreativeTab(Tabs.tabApiculture);
|
||||||
setUnlocalizedName("honeyComb");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void addSubtypes() {
|
public static void addSubtypes() {
|
||||||
|
|||||||
@@ -15,9 +15,8 @@ public class ItemHoneyDrop extends ItemProduct {
|
|||||||
protected IIcon icon2;
|
protected IIcon icon2;
|
||||||
|
|
||||||
public ItemHoneyDrop() {
|
public ItemHoneyDrop() {
|
||||||
super(EnumHoneyDrop.values());
|
super("honeyDrop", EnumHoneyDrop.values());
|
||||||
setCreativeTab(Tabs.tabApiculture);
|
setCreativeTab(Tabs.tabApiculture);
|
||||||
setUnlocalizedName("honeyDrop");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.extrabees.products;
|
package binnie.extrabees.products;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
@@ -12,11 +14,14 @@ public class ItemProduct extends Item {
|
|||||||
|
|
||||||
protected IItemEnum[] types;
|
protected IItemEnum[] types;
|
||||||
|
|
||||||
public ItemProduct(IItemEnum[] types) {
|
public ItemProduct(String name, IItemEnum[] types) {
|
||||||
this.types = types;
|
this.types = types;
|
||||||
setMaxStackSize(64);
|
setMaxStackSize(64);
|
||||||
setMaxDamage(0);
|
setMaxDamage(0);
|
||||||
setHasSubtypes(true);
|
setHasSubtypes(true);
|
||||||
|
setUnlocalizedName(name);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
public IItemEnum get(ItemStack stack) {
|
public IItemEnum get(ItemStack stack) {
|
||||||
|
|||||||
@@ -11,9 +11,8 @@ import forestry.api.core.Tabs;
|
|||||||
public class ItemPropolis extends ItemProduct {
|
public class ItemPropolis extends ItemProduct {
|
||||||
|
|
||||||
public ItemPropolis() {
|
public ItemPropolis() {
|
||||||
super(EnumPropolis.values());
|
super("propolis", EnumPropolis.values());
|
||||||
setCreativeTab(Tabs.tabApiculture);
|
setCreativeTab(Tabs.tabApiculture);
|
||||||
setUnlocalizedName("propolis");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import static binnie.extratrees.ExtraTrees.EB_MOD_NAME;
|
|||||||
import static binnie.extratrees.ExtraTrees.ET_MODID;
|
import static binnie.extratrees.ExtraTrees.ET_MODID;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.Item;
|
|
||||||
|
|
||||||
import com.gtnewhorizon.gtnhlib.config.ConfigException;
|
import com.gtnewhorizon.gtnhlib.config.ConfigException;
|
||||||
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
|
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
|
||||||
@@ -13,6 +12,7 @@ import binnie.core.AbstractMod;
|
|||||||
import binnie.core.BinnieCore;
|
import binnie.core.BinnieCore;
|
||||||
import binnie.core.Tags;
|
import binnie.core.Tags;
|
||||||
import binnie.core.gui.IBinnieGUID;
|
import binnie.core.gui.IBinnieGUID;
|
||||||
|
import binnie.core.item.ItemMisc;
|
||||||
import binnie.core.network.BinniePacketHandler;
|
import binnie.core.network.BinniePacketHandler;
|
||||||
import binnie.core.proxy.IProxyCore;
|
import binnie.core.proxy.IProxyCore;
|
||||||
import binnie.extrabees.ExtraBees;
|
import binnie.extrabees.ExtraBees;
|
||||||
@@ -26,6 +26,10 @@ import binnie.extratrees.config.ETConfig;
|
|||||||
import binnie.extratrees.core.ExtraTreesGUID;
|
import binnie.extratrees.core.ExtraTreesGUID;
|
||||||
import binnie.extratrees.core.ModuleCore;
|
import binnie.extratrees.core.ModuleCore;
|
||||||
import binnie.extratrees.genetics.ModuleGenetics;
|
import binnie.extratrees.genetics.ModuleGenetics;
|
||||||
|
import binnie.extratrees.item.ItemDictionary;
|
||||||
|
import binnie.extratrees.item.ItemFood;
|
||||||
|
import binnie.extratrees.item.ItemHammer;
|
||||||
|
import binnie.extratrees.item.ItemMothDatabase;
|
||||||
import binnie.extratrees.item.ModuleItems;
|
import binnie.extratrees.item.ModuleItems;
|
||||||
import binnie.extratrees.machines.ModuleMachine;
|
import binnie.extratrees.machines.ModuleMachine;
|
||||||
import binnie.extratrees.nei.IMCForNEI;
|
import binnie.extratrees.nei.IMCForNEI;
|
||||||
@@ -61,10 +65,13 @@ public class ExtraTrees extends AbstractMod {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Item itemDictionary;
|
public static ItemDictionary itemDictionary;
|
||||||
public static Item itemDictionaryLepi;
|
public static ItemMothDatabase itemDictionaryLepi;
|
||||||
public static Item itemMisc;
|
public static ItemMisc itemMisc;
|
||||||
public static Item itemFood;
|
public static ItemFood itemFood;
|
||||||
|
public static ItemHammer itemHammer;
|
||||||
|
public static ItemHammer itemDurableHammer;
|
||||||
|
|
||||||
public static Block blockStairs;
|
public static Block blockStairs;
|
||||||
public static Block blockLog;
|
public static Block blockLog;
|
||||||
public static BlockCarpentry blockCarpentry;
|
public static BlockCarpentry blockCarpentry;
|
||||||
@@ -75,13 +82,12 @@ public class ExtraTrees extends AbstractMod {
|
|||||||
public static BlockCarpentry blockPanel;
|
public static BlockCarpentry blockPanel;
|
||||||
public static Block blockSlab;
|
public static Block blockSlab;
|
||||||
public static Block blockDoubleSlab;
|
public static Block blockDoubleSlab;
|
||||||
public static Item itemHammer;
|
|
||||||
public static Item itemDurableHammer;
|
|
||||||
public static Block blockGate;
|
public static Block blockGate;
|
||||||
public static Block blockDoor;
|
public static Block blockDoor;
|
||||||
public static BlockMultiFence blockMultiFence;
|
public static BlockMultiFence blockMultiFence;
|
||||||
public static BlockHedge blockHedge;
|
public static BlockHedge blockHedge;
|
||||||
public static BlockStainedDesign blockStained;
|
public static BlockStainedDesign blockStained;
|
||||||
|
|
||||||
public static int doorRenderId;
|
public static int doorRenderId;
|
||||||
public static int branchRenderId;
|
public static int branchRenderId;
|
||||||
public static int fenceID;
|
public static int fenceID;
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.extratrees.item;
|
package binnie.extratrees.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -25,6 +27,8 @@ public class ItemDictionary extends Item {
|
|||||||
setCreativeTab(Tabs.tabArboriculture);
|
setCreativeTab(Tabs.tabArboriculture);
|
||||||
setUnlocalizedName("database");
|
setUnlocalizedName("database");
|
||||||
setMaxStackSize(1);
|
setMaxStackSize(1);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.extratrees.item;
|
package binnie.extratrees.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -24,6 +26,8 @@ public class ItemFood extends net.minecraft.item.ItemFood {
|
|||||||
setCreativeTab(Tabs.tabArboriculture);
|
setCreativeTab(Tabs.tabArboriculture);
|
||||||
setHasSubtypes(true);
|
setHasSubtypes(true);
|
||||||
items = Food.values();
|
items = Food.values();
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.extratrees.item;
|
package binnie.extratrees.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
@@ -22,6 +24,8 @@ public class ItemHammer extends Item implements IToolHammer {
|
|||||||
setUnlocalizedName(durable ? "durableHammer" : "hammer");
|
setUnlocalizedName(durable ? "durableHammer" : "hammer");
|
||||||
setMaxStackSize(1);
|
setMaxStackSize(1);
|
||||||
setMaxDamage(durable ? 1562 : 251);
|
setMaxDamage(durable ? 1562 : 251);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.extratrees.item;
|
package binnie.extratrees.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -25,6 +27,8 @@ public class ItemMothDatabase extends Item {
|
|||||||
setCreativeTab(Tabs.tabLepidopterology);
|
setCreativeTab(Tabs.tabLepidopterology);
|
||||||
setUnlocalizedName("databaseMoth");
|
setUnlocalizedName("databaseMoth");
|
||||||
setMaxStackSize(1);
|
setMaxStackSize(1);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class ModuleItems implements IInitializable {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void preInit() {
|
public void preInit() {
|
||||||
ExtraTrees.itemMisc = Binnie.Item.registerMiscItems(ExtraTreeItems.values(), Tabs.tabArboriculture);
|
ExtraTrees.itemMisc = new ItemMisc(Tabs.tabArboriculture, ExtraTreeItems.values());
|
||||||
ExtraTrees.itemDictionary = new ItemDictionary();
|
ExtraTrees.itemDictionary = new ItemDictionary();
|
||||||
if (BinnieCore.isLepidopteryActive()) {
|
if (BinnieCore.isLepidopteryActive()) {
|
||||||
ExtraTrees.itemDictionaryLepi = new ItemMothDatabase();
|
ExtraTrees.itemDictionaryLepi = new ItemMothDatabase();
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
package binnie.genetics;
|
package binnie.genetics;
|
||||||
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
|
|
||||||
import binnie.core.AbstractMod;
|
import binnie.core.AbstractMod;
|
||||||
import binnie.core.Tags;
|
import binnie.core.Tags;
|
||||||
import binnie.core.gui.IBinnieGUID;
|
import binnie.core.gui.IBinnieGUID;
|
||||||
|
import binnie.core.item.ItemMisc;
|
||||||
import binnie.core.machines.MachineGroup;
|
import binnie.core.machines.MachineGroup;
|
||||||
import binnie.core.network.BinniePacketHandler;
|
import binnie.core.network.BinniePacketHandler;
|
||||||
import binnie.core.network.IPacketID;
|
import binnie.core.network.IPacketID;
|
||||||
@@ -13,6 +12,10 @@ import binnie.genetics.core.GeneticsGUI;
|
|||||||
import binnie.genetics.core.GeneticsPacket;
|
import binnie.genetics.core.GeneticsPacket;
|
||||||
import binnie.genetics.item.ItemAnalyst;
|
import binnie.genetics.item.ItemAnalyst;
|
||||||
import binnie.genetics.item.ItemDatabase;
|
import binnie.genetics.item.ItemDatabase;
|
||||||
|
import binnie.genetics.item.ItemMasterRegistry;
|
||||||
|
import binnie.genetics.item.ItemRegistry;
|
||||||
|
import binnie.genetics.item.ItemSequence;
|
||||||
|
import binnie.genetics.item.ItemSerum;
|
||||||
import binnie.genetics.item.ItemSerumArray;
|
import binnie.genetics.item.ItemSerumArray;
|
||||||
import binnie.genetics.item.ModuleItem;
|
import binnie.genetics.item.ModuleItem;
|
||||||
import binnie.genetics.machine.ModuleMachine;
|
import binnie.genetics.machine.ModuleMachine;
|
||||||
@@ -38,18 +41,20 @@ public class Genetics extends AbstractMod {
|
|||||||
@SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer")
|
@SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer")
|
||||||
public static Proxy proxy;
|
public static Proxy proxy;
|
||||||
|
|
||||||
public static ItemSerumArray itemSerumArray = null;
|
|
||||||
public static final String CHANNEL = "GEN";
|
public static final String CHANNEL = "GEN";
|
||||||
public static Item itemGenetics;
|
|
||||||
public static Item itemSerum;
|
public static ItemSerumArray itemSerumArray = null;
|
||||||
public static Item itemSequencer;
|
public static ItemMisc itemGenetics;
|
||||||
|
public static ItemSerum itemSerum;
|
||||||
|
public static ItemSequence itemSequencer;
|
||||||
|
public static ItemDatabase database;
|
||||||
|
public static ItemAnalyst analyst;
|
||||||
|
public static ItemRegistry registry;
|
||||||
|
public static ItemMasterRegistry masterRegistry;
|
||||||
|
|
||||||
public static MachineGroup packageGenetic;
|
public static MachineGroup packageGenetic;
|
||||||
public static MachineGroup packageAdvGenetic;
|
public static MachineGroup packageAdvGenetic;
|
||||||
public static MachineGroup packageLabMachine;
|
public static MachineGroup packageLabMachine;
|
||||||
public static ItemDatabase database;
|
|
||||||
public static ItemAnalyst analyst;
|
|
||||||
public static Item registry;
|
|
||||||
public static Item masterRegistry;
|
|
||||||
|
|
||||||
public Genetics() {
|
public Genetics() {
|
||||||
Genetics.instance = this;
|
Genetics.instance = this;
|
||||||
|
|||||||
@@ -56,9 +56,6 @@ public enum GeneticsItems implements IItemMisc {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack get(int count) {
|
public ItemStack get(int count) {
|
||||||
if (Genetics.itemGenetics == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return new ItemStack(Genetics.itemGenetics, count, ordinal());
|
return new ItemStack(Genetics.itemGenetics, count, ordinal());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.genetics.item;
|
package binnie.genetics.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
@@ -19,6 +21,8 @@ public class ItemAnalyst extends Item {
|
|||||||
setCreativeTab(GeneticsCreativeTab.instance);
|
setCreativeTab(GeneticsCreativeTab.instance);
|
||||||
setUnlocalizedName("analyst");
|
setUnlocalizedName("analyst");
|
||||||
setMaxStackSize(1);
|
setMaxStackSize(1);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.genetics.item;
|
package binnie.genetics.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -25,6 +27,8 @@ public class ItemDatabase extends Item {
|
|||||||
setCreativeTab(GeneticsCreativeTab.instance);
|
setCreativeTab(GeneticsCreativeTab.instance);
|
||||||
setUnlocalizedName("database");
|
setUnlocalizedName("database");
|
||||||
setMaxStackSize(1);
|
setMaxStackSize(1);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.genetics.item;
|
package binnie.genetics.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -29,6 +31,8 @@ public class ItemFieldKit extends Item {
|
|||||||
setCreativeTab(GeneticsCreativeTab.instance);
|
setCreativeTab(GeneticsCreativeTab.instance);
|
||||||
setMaxStackSize(1);
|
setMaxStackSize(1);
|
||||||
setMaxDamage(64);
|
setMaxDamage(64);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.genetics.item;
|
package binnie.genetics.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -26,6 +28,8 @@ public abstract class ItemGene extends Item {
|
|||||||
setMaxDamage(16);
|
setMaxDamage(16);
|
||||||
setUnlocalizedName(unlocName);
|
setUnlocalizedName(unlocName);
|
||||||
setCreativeTab(GeneticsCreativeTab.instance);
|
setCreativeTab(GeneticsCreativeTab.instance);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.genetics.item;
|
package binnie.genetics.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
@@ -19,6 +21,8 @@ public class ItemMasterRegistry extends Item {
|
|||||||
setCreativeTab(GeneticsCreativeTab.instance);
|
setCreativeTab(GeneticsCreativeTab.instance);
|
||||||
setUnlocalizedName("masterRegistry");
|
setUnlocalizedName("masterRegistry");
|
||||||
setMaxStackSize(1);
|
setMaxStackSize(1);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.genetics.item;
|
package binnie.genetics.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
@@ -19,6 +21,8 @@ public class ItemRegistry extends Item {
|
|||||||
setCreativeTab(GeneticsCreativeTab.instance);
|
setCreativeTab(GeneticsCreativeTab.instance);
|
||||||
setUnlocalizedName("registry");
|
setUnlocalizedName("registry");
|
||||||
setMaxStackSize(1);
|
setMaxStackSize(1);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package binnie.genetics.item;
|
package binnie.genetics.item;
|
||||||
|
|
||||||
|
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
@@ -31,6 +33,8 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl
|
|||||||
setMaxDamage(5);
|
setMaxDamage(5);
|
||||||
setUnlocalizedName("sequence");
|
setUnlocalizedName("sequence");
|
||||||
setCreativeTab(GeneticsCreativeTab.instance);
|
setCreativeTab(GeneticsCreativeTab.instance);
|
||||||
|
|
||||||
|
registerItem(this, getUnlocalizedName().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack create(IGene gene) {
|
public static ItemStack create(IGene gene) {
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import binnie.botany.Botany;
|
|||||||
import binnie.core.BinnieCore;
|
import binnie.core.BinnieCore;
|
||||||
import binnie.core.IInitializable;
|
import binnie.core.IInitializable;
|
||||||
import binnie.core.Mods;
|
import binnie.core.Mods;
|
||||||
|
import binnie.core.item.ItemMisc;
|
||||||
import binnie.core.liquid.ItemFluidContainer;
|
import binnie.core.liquid.ItemFluidContainer;
|
||||||
import binnie.core.resource.BinnieIcon;
|
import binnie.core.resource.BinnieIcon;
|
||||||
import binnie.extrabees.ExtraBees;
|
import binnie.extrabees.ExtraBees;
|
||||||
@@ -44,7 +45,7 @@ public class ModuleItem implements IInitializable {
|
|||||||
Genetics.itemSerum = new ItemSerum();
|
Genetics.itemSerum = new ItemSerum();
|
||||||
Genetics.itemSerumArray = new ItemSerumArray();
|
Genetics.itemSerumArray = new ItemSerumArray();
|
||||||
Genetics.itemSequencer = new ItemSequence();
|
Genetics.itemSequencer = new ItemSequence();
|
||||||
Genetics.itemGenetics = Binnie.Item.registerMiscItems(GeneticsItems.values(), GeneticsCreativeTab.instance);
|
Genetics.itemGenetics = new ItemMisc(GeneticsCreativeTab.instance, GeneticsItems.values());
|
||||||
Genetics.database = new ItemDatabase();
|
Genetics.database = new ItemDatabase();
|
||||||
Genetics.analyst = new ItemAnalyst();
|
Genetics.analyst = new ItemAnalyst();
|
||||||
Genetics.registry = new ItemRegistry();
|
Genetics.registry = new ItemRegistry();
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ import forestry.api.genetics.IIndividual;
|
|||||||
|
|
||||||
public class SplicerComponentLogic extends ComponentProcessSetCost implements IProcess {
|
public class SplicerComponentLogic extends ComponentProcessSetCost implements IProcess {
|
||||||
|
|
||||||
|
// Needed to keep stack. If user takes out target slot and it gets automatically refilled, this happens in the same
|
||||||
|
// tick
|
||||||
|
private ItemStack workedOnStack = null;
|
||||||
|
|
||||||
public int nOfGenes;
|
public int nOfGenes;
|
||||||
|
|
||||||
public SplicerComponentLogic(Machine machine) {
|
public SplicerComponentLogic(Machine machine) {
|
||||||
@@ -50,6 +54,11 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP
|
|||||||
public void onInventoryUpdate() {
|
public void onInventoryUpdate() {
|
||||||
super.onInventoryUpdate();
|
super.onInventoryUpdate();
|
||||||
nOfGenes = getGenesToUse();
|
nOfGenes = getGenesToUse();
|
||||||
|
ItemStack newTarget = getUtil().getStack(Splicer.SLOT_TARGET);
|
||||||
|
|
||||||
|
if (newTarget == null || !ItemStack.areItemStacksEqual(workedOnStack, newTarget)) {
|
||||||
|
workedOnStack = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected int getGenesToUse() {
|
protected int getGenesToUse() {
|
||||||
@@ -190,5 +199,31 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP
|
|||||||
Splicer.setGene(gene, target, 1);
|
Splicer.setGene(gene, target, 1);
|
||||||
}
|
}
|
||||||
getUtil().damageItem(Splicer.SLOT_SERUM_VIAL, 1);
|
getUtil().damageItem(Splicer.SLOT_SERUM_VIAL, 1);
|
||||||
|
workedOnStack = getUtil().getStack(Splicer.SLOT_TARGET).copy();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean workedOnTarget() {
|
||||||
|
return ItemStack.areItemStacksEqual(workedOnStack, getUtil().getStack(Splicer.SLOT_TARGET));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void readFromNBT(NBTTagCompound nbt) {
|
||||||
|
super.readFromNBT(nbt);
|
||||||
|
NBTTagCompound tagWorkedOnStack = (NBTTagCompound) nbt.getTag("workedOnStack");
|
||||||
|
if (tagWorkedOnStack != null) {
|
||||||
|
workedOnStack = ItemStack.loadItemStackFromNBT(tagWorkedOnStack);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void writeToNBT(NBTTagCompound nbt) {
|
||||||
|
super.writeToNBT(nbt);
|
||||||
|
if (workedOnStack != null) {
|
||||||
|
NBTTagCompound tagWorkedOnStack = new NBTTagCompound();
|
||||||
|
workedOnStack.writeToNBT(tagWorkedOnStack);
|
||||||
|
// Need to save, in case inventory is full it might need to get moved out way later.
|
||||||
|
nbt.setTag("workedOnStack", tagWorkedOnStack);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@ package binnie.genetics.machine.splicer;
|
|||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import binnie.core.craftgui.minecraft.IMachineInformation;
|
import binnie.core.craftgui.minecraft.IMachineInformation;
|
||||||
|
import binnie.core.machines.IMachine;
|
||||||
import binnie.core.machines.Machine;
|
import binnie.core.machines.Machine;
|
||||||
import binnie.core.machines.inventory.ComponentInventorySlots;
|
import binnie.core.machines.inventory.ComponentInventorySlots;
|
||||||
import binnie.core.machines.inventory.ComponentInventoryTransfer;
|
import binnie.core.machines.inventory.ComponentInventoryTransfer;
|
||||||
@@ -79,8 +80,20 @@ public class SplicerPackage extends AdvGeneticMachine.PackageAdvGeneticBase impl
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean fufilled(ItemStack stack) {
|
public boolean fufilled(ItemStack stack) {
|
||||||
return stack != null && transfer.getMachine().getMachineUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null
|
if (stack == null) {
|
||||||
&& transfer.getMachine().getInterface(SplicerComponentLogic.class).isValidSerum() != null;
|
return false;
|
||||||
|
}
|
||||||
|
IMachine machine = transfer.getMachine();
|
||||||
|
boolean hasSerum = machine.getMachineUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null;
|
||||||
|
|
||||||
|
if (hasSerum) {
|
||||||
|
// Move item if it can't be processed anymore with current serum.
|
||||||
|
boolean validSerum = machine.getInterface(SplicerComponentLogic.class).isValidSerum() == null;
|
||||||
|
return !validSerum;
|
||||||
|
} else {
|
||||||
|
// Move item if there is no serum and item got processed already
|
||||||
|
return machine.getMachineUtil().getProcess().workedOnTarget();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user