aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/core/item
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/miscutil/core/item')
-rw-r--r--src/Java/miscutil/core/item/ModItems.java16
-rw-r--r--src/Java/miscutil/core/item/base/dusts/BaseItemDust.java18
-rw-r--r--src/Java/miscutil/core/item/base/rings/BaseItemRing.java4
-rw-r--r--src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java44
4 files changed, 55 insertions, 27 deletions
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index bf988c7893..20f9a00bb2 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -218,6 +218,22 @@ public final class ModItems {
UtilsItems.generateItemsFromMaterial("Tumbaga", "Tumbaga", 2, MaterialInfo.TUMBAGA, Utils.rgbtoHexValue(255,178,15), false); //Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper
UtilsItems.generateItemsFromMaterial("Potin", "Potin", 4, MaterialInfo.POTIN, Utils.rgbtoHexValue(201,151,129), false); //Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible
+
+ UtilsItems.generateItemsFromMaterial("HastelloyW", "Hastelloy-W", 6, MaterialInfo.HASTELLOY_W, Utils.rgbtoHexValue(218, 165, 32), false);
+ UtilsItems.generateItemsFromMaterial("HastelloyX", "Hastelloy-X", 6, MaterialInfo.HASTELLOY_X, Utils.rgbtoHexValue(255, 193, 37), false);
+ UtilsItems.generateItemsFromMaterial("HastelloyC276", "Hastelloy-C276", 7, MaterialInfo.HASTELLOY_C276, Utils.rgbtoHexValue(238, 180, 34), true);
+
+ UtilsItems.generateItemsFromMaterial("Incoloy020", "Incoloy-020", 7, MaterialInfo.INCOLOY020, Utils.rgbtoHexValue(81, 81, 81), false);
+ UtilsItems.generateItemsFromMaterial("IncoloyDS", "Incoloy-DS", 7, MaterialInfo.INCOLOYDS, Utils.rgbtoHexValue(91, 91, 91), false);
+ UtilsItems.generateItemsFromMaterial("IncoloyMA956", "Incoloy-MA956", 8, MaterialInfo.INCOLOYMA956, Utils.rgbtoHexValue(101, 101, 101), true);
+
+
+ UtilsItems.generateItemsFromMaterial("Zirconium", "Zirconium", 6, MaterialInfo.ZIRCONIUM, Utils.rgbtoHexValue(255, 250, 205), false);
+ UtilsItems.generateItemsFromMaterial("ZirconiumCarbide", "Zirconium Carbide", 7, MaterialInfo.ZIRCONIUMCARBIDE, Utils.rgbtoHexValue(222, 202, 180), true);
+ UtilsItems.generateItemsFromMaterial("TantalumCarbide", "Tantalum Carbide", 7, MaterialInfo.TANTALUMCARBIDE, Utils.rgbtoHexValue(139, 136, 120), true);
+ UtilsItems.generateItemsFromMaterial("NiobiumCarbide", "Niobium Carbide", 6, MaterialInfo.NIOMBIUMCARBIDE, Utils.rgbtoHexValue(205, 197, 191), true);
+
+
//EnderIO Resources
if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){
Utils.LOG_INFO("EnderIO Found - Loading Resources.");
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
index 6402037997..c1311f0c7b 100644
--- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
@@ -180,18 +180,30 @@ public class BaseItemDust extends Item{
null, null, null);
}
else {
- Utils.LOG_INFO("Generating a Dust recipe for "+materialName+" in the mixer.");
+ Utils.LOG_WARNING("Generating a Dust recipe for "+materialName+" in the mixer.");
int i = 0;
+ if (inputStacks.length >= 2){
for (ItemStack is : inputStacks){
- i++;
if (is != null){
- Utils.LOG_INFO("Found "+is.getDisplayName()+" as an input for mixer recipe.");
+ Utils.LOG_INFO("Found "+is.getDisplayName()+" as an input for mixer recipe.");
+ if (is.getDisplayName().toLowerCase().contains("tell alkalus")){
+ ItemStack tempStackForAName = inputStacks[i];
+ String[] inputList = dustInfo.getInputItemsAsList();
+ int[] inputSizes = dustInfo.getInputStackSizesAsList();
+ inputStacks[i] = UtilsItems.getItemStackOfAmountFromOreDict(inputList[i], inputSizes[i]);
+ Utils.LOG_INFO("Swapping input slot "+i+" which contains "+tempStackForAName.getDisplayName()+" with "+inputStacks[i].getDisplayName()+".");
+ }
+
}
+
else {
Utils.LOG_INFO("Input "+i+" was null.");
}
+
+ i++;
+ }
}
GT_Values.RA.addMixerRecipe(
diff --git a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java
index 0ec02b0299..dbbb233098 100644
--- a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java
+++ b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java
@@ -74,8 +74,8 @@ public class BaseItemRing extends Item{
GT_Values.RA.addExtruderRecipe(tempOutputStack,
ItemList.Shape_Extruder_Ring.get(1),
UtilsItems.getSimpleStack(this, 4),
- 160*mTier,
- 32*mTier);
+ 12*mTier*20,
+ 24*mTier);
}
}
diff --git a/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java b/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java
index 088d8cc446..0e66f7aae3 100644
--- a/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java
+++ b/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java
@@ -82,11 +82,11 @@ public class StaballoyAxe extends ItemAxe{
private int check(World par1World, int x, int y, int z, int xo, int yo,int zo) {
int f=0;
- int o=x+z*20+y*400;
+ int o=x+z*40+y*400;
if (tre[o]==needcheck){
tre[o]=ignore;
Block bit = par1World.getBlock(x+xo, y+yo, z+zo);
- if ((bit instanceof BlockLog)||(bit instanceof BlockLeavesBase)||(bit instanceof BlockHugeMushroom)){
+ if ((bit instanceof BlockLog)||(bit instanceof BlockLeavesBase)||(bit instanceof BlockHugeMushroom) || (bit.getUnlocalizedName().toLowerCase().contains("log")) || (bit.getUnlocalizedName().toLowerCase().contains("wood"))){
f=1;
tre[o]=harvest;
//if (bit instanceof BlockLog){
@@ -107,18 +107,18 @@ public class StaballoyAxe extends ItemAxe{
boolean f;
for (f=true;f==true;){
f=false;
- for (int y=0;y<80;y++)
- for(int z=0;z<20;z++)
- for(int x=0;x<20;x++){
+ for (int y=-10;y<110;y++)
+ for(int z=0;z<40;z++)
+ for(int x=0;x<40;x++){
int r=check(par1World,x,y,z,xo,yo,zo);
if (r==3) return 3;
if (r==2) return 2;
if (r==1) f=true;
}
- for (int y=79;y>=0;y--)
- for(int z=19;z>=0;z--)
- for(int x=19;x>=0;x--){
+ for (int y=109;y>=-10;y--)
+ for(int z=39;z>=0;z--)
+ for(int x=39;x>=0;x--){
int r=check(par1World,x,y,z,xo,yo,zo);
if (r==2) return 3;
if (r==2) return 2;
@@ -130,11 +130,11 @@ public class StaballoyAxe extends ItemAxe{
private int check2(World par1World, int x, int y, int z, int xo, int yo,int zo) {
int f=0;
- int o=x+z*20+y*400;
+ int o=x+z*40+y*400;
if (tre[o]==needcheck){
tre[o]=ignore;
Block bit = par1World.getBlock(x+xo, y+yo, z+zo);
- if (bit instanceof BlockLog){
+ if (bit instanceof BlockLog || (bit.getUnlocalizedName().toLowerCase().contains("log")) || (bit.getUnlocalizedName().toLowerCase().contains("wood"))){
f=1;
tre[o]=harvest;
//if (bit instanceof BlockLog){
@@ -156,18 +156,18 @@ public class StaballoyAxe extends ItemAxe{
boolean f;
for (f=true;f==true;){
f=false;
- for (int y=0;y<80;y++)
- for(int z=0;z<20;z++)
- for(int x=0;x<20;x++){
+ for (int y=-10;y<110;y++)
+ for(int z=0;z<40;z++)
+ for(int x=0;x<40;x++){
int r=check2(par1World,x,y,z,xo,yo,zo);
if (r==3) return 3;
if (r==2) return 2;
if (r==1) f=true;
}
- for (int y=79;y>=0;y--)
- for(int z=19;z>=0;z--)
- for(int x=19;x>=0;x--){
+ for (int y=109;y>=-10;y--)
+ for(int z=39;z>=0;z--)
+ for(int x=39;x>=0;x--){
int r=check2(par1World,x,y,z,xo,yo,zo);
if (r==2) return 3;
if (r==2) return 2;
@@ -178,15 +178,15 @@ public class StaballoyAxe extends ItemAxe{
}
public void exploadTree(World par1World,int xo,int yo,int zo, EntityPlayer plr){
- for (int y=0;y<80;y++)
- for(int z=0;z<20;z++)
- for(int x=0;x<20;x++){
- int o=x+z*20+y*400;
+ for (int y=-10;y<110;y++)
+ for(int z=0;z<40;z++)
+ for(int x=0;x<40;x++){
+ int o=x+z*40+y*400;
if (tre[o]==harvest){
Block bit = par1World.getBlock(x+xo, y+yo, z+zo);
int met = par1World.getBlockMetadata(x+xo, y+yo, z+zo);
- if ((bit instanceof BlockLog)||(bit instanceof BlockLeavesBase)){
+ if ((bit instanceof BlockLog)||(bit instanceof BlockLeavesBase) || (bit.getUnlocalizedName().toLowerCase().contains("log")) || (bit.getUnlocalizedName().toLowerCase().contains("wood"))){
bit.harvestBlock(par1World, plr, x+xo, y+yo, z+zo,met);
par1World.setBlockToAir(x+xo, y+yo, z+zo);
}
@@ -244,7 +244,7 @@ public class StaballoyAxe extends ItemAxe{
}
}
- if (bit instanceof BlockLog){
+ if (bit instanceof BlockLog || (bit.getUnlocalizedName().toLowerCase().contains("log")) || (bit.getUnlocalizedName().toLowerCase().contains("wood"))){
//LoonTools.log("cutting tree @ "+x+" "+y+" "+z+" ");
for (int n=0;n<32000;n++) tre[n]=unchecked;
int met = wld.getBlockMetadata(x, y, z);
generated by cgit (git 2.46.0) at 2025-03-12 16:59:13 +0000