aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-10-16 16:49:24 +0100
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-10-16 16:49:24 +0100
commit351b0e3bda46103d43890cd5313bbb9b19ab0872 (patch)
tree5df11382b2111ca1cd14442bea58f7696511cb0f /src
parentf41f53aea4d42d26001572b72a1f3e40feb3f159 (diff)
downloadGT5-Unofficial-351b0e3bda46103d43890cd5313bbb9b19ab0872.tar.gz
GT5-Unofficial-351b0e3bda46103d43890cd5313bbb9b19ab0872.tar.bz2
GT5-Unofficial-351b0e3bda46103d43890cd5313bbb9b19ab0872.zip
+ Added some new items for Biochem recipes.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java2
-rw-r--r--src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java26
-rw-r--r--src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java169
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang28
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.pngbin0 -> 605 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.pngbin0 -> 627 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/10.pngbin0 -> 516 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/11.pngbin0 -> 392 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/12.pngbin0 -> 704 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/13.pngbin0 -> 373 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/14.pngbin0 -> 427 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.pngbin0 -> 210 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.pngbin0 -> 157 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.pngbin0 -> 194 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.pngbin0 -> 237 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.pngbin0 -> 174 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.pngbin0 -> 633 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.pngbin0 -> 354 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.pngbin0 -> 273 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.pngbin0 -> 332 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.pngbin0 -> 646 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.pngbin0 -> 622 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/5.pngbin0 -> 490 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/6.pngbin0 -> 455 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/7.pngbin0 -> 452 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/8.pngbin0 -> 624 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/9.pngbin0 -> 277 bytes
27 files changed, 224 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java b/src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java
index 316e1cc143..894a5b2349 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java
@@ -2,6 +2,7 @@ package gtPlusPlus.plugin.agrichem;
import gtPlusPlus.api.interfaces.IPlugin;
import gtPlusPlus.plugin.agrichem.fluids.FluidLoader;
+import gtPlusPlus.plugin.agrichem.item.algae.ItemAgrichemBase;
import gtPlusPlus.plugin.agrichem.item.algae.ItemAlgaeBase;
import gtPlusPlus.plugin.manager.Core_Manager;
@@ -19,6 +20,7 @@ public class Core_Agrichem implements IPlugin {
public boolean preInit() {
FluidLoader.generate();
new ItemAlgaeBase();
+ new ItemAgrichemBase();
return true;
}
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java b/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
new file mode 100644
index 0000000000..ad869afc47
--- /dev/null
+++ b/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
@@ -0,0 +1,26 @@
+package gtPlusPlus.plugin.agrichem.block;
+
+public class AgrichemFluids {
+
+ /*
+ * Saline Water - saltwater
+ * Sulfuric Waste Water - sulfuricapatite
+ * Methanol - methanol
+ * Hot Water - ic2hotwater
+ * Acetic Acid
+ * Propionic Acid
+ * Fermentation Base
+ * Ethylene - ethylene
+ * Ethanol - bioethanol
+ * Diluted SA - filutedsulfuricacid
+ * Sulfuric Acid - sulfuricacid
+ * Urea
+ * Formaldehyde - fluid.formaldehyde
+ * Liquid Resin
+ * Methane - methane
+ * Benzene - benzene
+ * Ethylbenzene - fluid.ethylbenzene
+ * Styrene - styrene
+ */
+
+}
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java b/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java
new file mode 100644
index 0000000000..b636fa7006
--- /dev/null
+++ b/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java
@@ -0,0 +1,169 @@
+package gtPlusPlus.plugin.agrichem.item.algae;
+
+import java.util.List;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class ItemAgrichemBase extends Item {
+
+ protected IIcon base[] = new IIcon[22];
+
+ /*
+ * 0 - Algae Biomass
+ * 1 - Green Algae Biomass
+ * 2 - Brown Algae Biomass
+ * 3 - Golden-Brown Algae Biomass
+ * 4 - Red Algae Biomass
+ * 5 - Cellulose Fiber
+ * 6 - Golden-Brown Cellulose Fiber
+ * 7 - Red Cellulose Fiber
+ * 8 - Compost
+ * 9 - Wood Pellet
+ * 10 - Wood Brick
+ * 11 - Cellulose Pulp
+ * 12 - Raw Bio Resin
+ * 13 - Catalyst Carrier
+ * 14 - Green Metal Catalyst
+ * 15 - Alginic Acid
+ * 16 - Alumina
+ * 17 - Aluminium Pellet
+ * 18 - Sodium Aluminate
+ * 19 - Sodium Hydroxide // Exists in Newer GT
+ * 20 - Sodium Carbonate
+ * 21 - Lithium Chloride
+ */
+
+ public ItemAgrichemBase() {
+ this.setHasSubtypes(true);
+ this.setMaxDamage(127);
+ this.setNoRepair();
+ this.setMaxStackSize(64);
+ this.setUnlocalizedName("BasicAgrichemItem");
+ GameRegistry.registerItem(this, this.getUnlocalizedName());
+ }
+
+ @Override
+ public boolean isDamageable() {
+ return false;
+ }
+
+ @Override
+ public boolean shouldRotateAroundWhenRendering() {
+ return super.shouldRotateAroundWhenRendering();
+ }
+
+ @Override
+ public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) {
+ super.onUpdate(p_77663_1_, p_77663_2_, p_77663_3_, p_77663_4_, p_77663_5_);
+ }
+
+ @Override
+ public String getItemStackDisplayName(ItemStack aStack) {
+ return super.getItemStackDisplayName(aStack);
+ }
+
+ @Override
+ public void addInformation(ItemStack aStack, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
+ try {
+
+ }
+ catch (Throwable t) {
+ t.printStackTrace();
+ }
+ super.addInformation(aStack, p_77624_2_, aList, p_77624_4_);
+ }
+
+ @Override
+ public EnumRarity getRarity(ItemStack p_77613_1_) {
+ return EnumRarity.common;
+ }
+
+ @Override
+ public boolean requiresMultipleRenderPasses() {
+ return false;
+ }
+
+ @Override
+ public void getSubItems(Item aItem, CreativeTabs p_150895_2_, List aList) {
+ for (int i=0;i<base.length;i++) {
+ aList.add(ItemUtils.simpleMetaStack(aItem, i, 1));
+ }
+ }
+
+ @Override
+ public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) {
+ return false;
+ }
+
+ @Override
+ public boolean isRepairable() {
+ return false;
+ }
+
+ @Override
+ public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
+ return false;
+ }
+
+ @Override
+ public int getDisplayDamage(ItemStack stack) {
+ return stack.getItemDamage();
+ }
+
+ @Override
+ public boolean showDurabilityBar(ItemStack stack) {
+ return false;
+ }
+
+ @Override
+ public int getItemEnchantability() {
+ return 0;
+ }
+
+ @Override
+ public int getItemEnchantability(ItemStack stack) {
+ return 0;
+ }
+
+ @Override
+ public void registerIcons(final IIconRegister u) {
+ for (int i=0;i<23;i++) {
+ this.base[i] = u.registerIcon(CORE.MODID + ":" + "bioscience/MetaItem1/"+i);
+ }
+ }
+
+ @Override
+ public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
+ return this.base[damage];
+ }
+
+ @Override
+ public IIcon getIconFromDamage(int damage) {
+ return this.base[damage];
+ }
+
+ @Override
+ public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
+ return this.base[stack.getItemDamage()];
+ }
+
+ @Override
+ public IIcon getIcon(ItemStack stack, int pass) {
+ return this.base[stack.getItemDamage()];
+ }
+
+
+
+
+}
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index a66ac39435..fe78eaf5ea 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -3034,4 +3034,30 @@ tile.blockRoundRobinator.0.name=Round Robinator I
tile.blockRoundRobinator.1.name=Round Robinator II
tile.blockRoundRobinator.2.name=Round Robinator III
tile.blockRoundRobinator.3.name=Round Robinator IV
-tile.blockRoundRobinator.4.name=Round Robinator V \ No newline at end of file
+tile.blockRoundRobinator.4.name=Round Robinator V
+
+
+//Added 16/10/19
+item.BasicAgrichemItem.0.name=Algae Biomass
+item.BasicAgrichemItem.1.name=Green Algae Biomass
+item.BasicAgrichemItem.2.name=Brown Algae Biomass
+item.BasicAgrichemItem.3.name=Golden-Brown Algae Biomass
+item.BasicAgrichemItem.4.name=Red Algae Biomass
+item.BasicAgrichemItem.5.name=Cellulose Fiber
+item.BasicAgrichemItem.6.name=Golden-Brown Cellulose Fiber
+item.BasicAgrichemItem.7.name=Red Cellulose Fiber
+item.BasicAgrichemItem.8.name=Compost
+item.BasicAgrichemItem.9.name=Wood Pellet
+item.BasicAgrichemItem.10.name=Wood Brick
+item.BasicAgrichemItem.11.name=Cellulose Pulp
+item.BasicAgrichemItem.12.name=Raw Bio Resin
+item.BasicAgrichemItem.13.name=Catalyst Carrier
+item.BasicAgrichemItem.14.name=Green Metal Catalyst
+item.BasicAgrichemItem.15.name=Alginic Acid
+item.BasicAgrichemItem.16.name=Alumina
+item.BasicAgrichemItem.17.name=Aluminium Pellet
+item.BasicAgrichemItem.18.name=Sodium Aluminate
+item.BasicAgrichemItem.19.name=Sodium Hydroxide
+item.BasicAgrichemItem.20.name=Sodium Carbonate
+item.BasicAgrichemItem.21.name=Carlcium Carbonate
+item.BasicAgrichemItem.22.name=Lithium Chloride \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png
new file mode 100644
index 0000000000..57d77be16a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png
new file mode 100644
index 0000000000..51bb4587d9
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/10.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/10.png
new file mode 100644
index 0000000000..e81bae4aae
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/10.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/11.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/11.png
new file mode 100644
index 0000000000..0cc273996e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/11.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/12.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/12.png
new file mode 100644
index 0000000000..dca743acd3
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/12.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/13.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/13.png
new file mode 100644
index 0000000000..15257d9efd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/13.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/14.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/14.png
new file mode 100644
index 0000000000..f81fc43aff
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/14.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png
new file mode 100644
index 0000000000..7b10c11773
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png
new file mode 100644
index 0000000000..7a78764496
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png
new file mode 100644
index 0000000000..677a1aa6d0
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png
new file mode 100644
index 0000000000..5b1833bea9
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png
new file mode 100644
index 0000000000..a8b45c9288
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png
new file mode 100644
index 0000000000..2cdf37adad
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png
new file mode 100644
index 0000000000..ab9ddf3e1b
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png
new file mode 100644
index 0000000000..042d30a9a9
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.png
new file mode 100644
index 0000000000..1aa59863ea
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png
new file mode 100644
index 0000000000..c98e2d6319
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png
new file mode 100644
index 0000000000..af0bcc7064
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/5.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/5.png
new file mode 100644
index 0000000000..1b60b7f555
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/5.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/6.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/6.png
new file mode 100644
index 0000000000..7f6f045430
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/6.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/7.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/7.png
new file mode 100644
index 0000000000..8a2cd2891b
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/7.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/8.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/8.png
new file mode 100644
index 0000000000..c16e0a1278
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/8.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/9.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/9.png
new file mode 100644
index 0000000000..df99f3f5e8
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/9.png
Binary files differ