aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/miscutil/core/block/base/BlockBaseModular.java12
-rw-r--r--src/Java/miscutil/core/item/ModItems.java4
-rw-r--r--src/Java/miscutil/core/item/base/dusts/BaseItemDust.java17
-rw-r--r--src/Java/miscutil/core/item/general/RF2EU_Battery.java2
-rw-r--r--src/Java/miscutil/core/lib/MaterialInfo.java4
5 files changed, 26 insertions, 13 deletions
diff --git a/src/Java/miscutil/core/block/base/BlockBaseModular.java b/src/Java/miscutil/core/block/base/BlockBaseModular.java
index 377ab833e7..106eb50954 100644
--- a/src/Java/miscutil/core/block/base/BlockBaseModular.java
+++ b/src/Java/miscutil/core/block/base/BlockBaseModular.java
@@ -26,7 +26,17 @@ public class BlockBaseModular extends BasicBlock{
this.thisBlock = blockType;
this.thisBlockMaterial = blockMaterial;
this.setBlockName(getLocalizedName());
- LanguageRegistry.addName(this, unlocalizedName);
+
+ if (thisBlock == BlockTypes.STANDARD){
+ LanguageRegistry.addName(this, "Block of "+unlocalizedName);
+ }
+ else if (thisBlock == BlockTypes.FRAME){
+ LanguageRegistry.addName(this, unlocalizedName+ " Frame Box");
+ }
+ else {
+ LanguageRegistry.addName(this, unlocalizedName);
+ }
+
//setOreDict(unlocalizedName, blockType);
if (thisBlock == BlockTypes.STANDARD){
GameRegistry.registerBlock(this, ItemBlockGtBlock.class, blockType.getTexture()+unlocalizedName);
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index 2ce795501e..bf988c7893 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -204,7 +204,9 @@ public final class ModItems {
UtilsItems.generateItemsFromMaterial("Inconel792", "Inconel-792", 5, MaterialInfo.INCONEL792, Utils.rgbtoHexValue(108, 240, 118), true); //Inconel 792: Increased aluminium content for improved high temperature corrosion properties, used especially in gas turbines.
- UtilsItems.generateItemsFromMaterial("TungstenCarbide", "Tungsten Carbide", 5, MaterialInfo.TUNGSTENCARBIDE, Utils.rgbtoHexValue(44, 44, 44), true);
+ if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
+ UtilsItems.generateItemsFromMaterial("TungstenCarbide", "Tungsten Carbide", 5, MaterialInfo.TUNGSTENCARBIDE, Utils.rgbtoHexValue(44, 44, 44), true);
+ }
UtilsItems.generateItemsFromMaterial("SiliconCarbide", "Silicon Carbide", 4, MaterialInfo.SILICONCARBIDE, Utils.rgbtoHexValue(32, 32, 32), false);
UtilsItems.generateItemsFromMaterial("Zeron100", "Zeron-100", 8, MaterialInfo.ZERON100, Utils.rgbtoHexValue(180, 180, 20), true);
UtilsItems.generateItemsFromMaterial("MaragingSteel250", "Maraging Steel 250", 4, MaterialInfo.MARAGING250, Utils.rgbtoHexValue(140, 140, 140), true);
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
index 49fb1ac13d..6402037997 100644
--- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
@@ -6,7 +6,6 @@ import gregtech.api.enums.ItemList;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
import java.util.List;
@@ -183,12 +182,7 @@ public class BaseItemDust extends Item{
else {
Utils.LOG_INFO("Generating a Dust recipe for "+materialName+" in the mixer.");
- /*GT_Values.RA.addMixerRecipe(
- inputStacks[0], inputStacks[1],
- inputStacks[2], inputStacks[3],
- null, null,
- tempOutput,
- 8*mTier*20, 8*mTier*2);*/
+
int i = 0;
for (ItemStack is : inputStacks){
i++;
@@ -201,11 +195,18 @@ public class BaseItemDust extends Item{
}
GT_Values.RA.addMixerRecipe(
+ inputStacks[0], inputStacks[1],
+ inputStacks[2], inputStacks[3],
+ null, null,
+ tempOutput,
+ 8*mTier*20, 8*mTier*2);
+
+ /*GT_Values.RA.addMixerRecipe(
GT_Utility.copyAmount(inputStacks[0].stackSize, new Object[]{inputStacks[0]}), GT_Utility.copyAmount(inputStacks[1].stackSize, new Object[]{inputStacks[1]}),
GT_Utility.copyAmount(inputStacks[2].stackSize, new Object[]{inputStacks[2]}), GT_Utility.copyAmount(inputStacks[3].stackSize, new Object[]{inputStacks[3]}),
null, null,
tempOutput,
- 8*mTier*20, 8*mTier*2);
+ 8*mTier*20, 8*mTier*2);*/
}
}
diff --git a/src/Java/miscutil/core/item/general/RF2EU_Battery.java b/src/Java/miscutil/core/item/general/RF2EU_Battery.java
index ae03ea5a06..9c024c27f4 100644
--- a/src/Java/miscutil/core/item/general/RF2EU_Battery.java
+++ b/src/Java/miscutil/core/item/general/RF2EU_Battery.java
@@ -40,7 +40,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
GameRegistry.registerFuelHandler(this);
//this.setMaxDamage(Integer.MAX_VALUE);
//this.setDamage(UtilsItems.getSimpleStack(this), 0);
- this.setCreativeTab(AddToCreativeTab.tabMisc);
+ this.setCreativeTab(AddToCreativeTab.tabMachines);
this.setUnlocalizedName(unlocalizedName);
this.setMaxStackSize(1);
this.setTextureName(CORE.MODID + ":" + "itemIngot");
diff --git a/src/Java/miscutil/core/lib/MaterialInfo.java b/src/Java/miscutil/core/lib/MaterialInfo.java
index f76166eb49..1d18b53f79 100644
--- a/src/Java/miscutil/core/lib/MaterialInfo.java
+++ b/src/Java/miscutil/core/lib/MaterialInfo.java
@@ -12,8 +12,8 @@ public enum MaterialInfo {
TANTALLOY60(getStack("dustTungsten", 1), getStack("dustTantalum", 8), getStack("dustTinyTitanium", 5), null, "dustTantalloy60", 1, noItem, 0),
TANTALLOY61(getStack("dustTungsten", 1), getStack("dustSmallTitanium", 3), getStack("dustSmallYttrium", 2), getStack("dustTantalum", 9), "dustTantalloy61", 1, noItem, 0),
QUANTUM(null, null, null, null, noItem, 0, noItem, 0),
- TUMBAGA(getStack("dustGold", 6), getStack("dustCopper", 3), null, null, "dustTumbaga", 1, noItem, 0),
- POTIN(getStack("dustBronze", 3), getStack("dustTin", 2), getStack("dustLead", 4), null, "dustPotin", 1, noItem, 0),
+ TUMBAGA(getStack("dustGold", 6), getStack("dustCopper", 3), null, null, "dustTumbaga", 2, noItem, 0),
+ POTIN(getStack("dustBronze", 3), getStack("dustTin", 2), getStack("dustLead", 4), null, "dustPotin", 3, noItem, 0),
BEDROCKIUM(null, null, null, null, noItem, 0, noItem, 0),
INCONEL625(getStack("dustNickel", 5), getStack("dustChrome", 2), getStack("dustWroughtIron", 1), getStack("dustMolybdenum", 1), "dustInconel625", 4, "dustTinyDarkAsh", 1),
INCONEL690(getStack("dustNickel", 5), getStack("dustChrome", 2), getStack("dustNiobium", 1), getStack("dustMolybdenum", 1), "dustInconel690", 2, "dustTinyDarkAsh", 1),