aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Java/miscutil/core/item/ModItems.java28
-rw-r--r--src/Java/miscutil/core/item/base/foods/BaseItemFood.java12
-rw-r--r--src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java (renamed from src/Java/miscutil/core/item/base/BaseItemHotFood.java)7
-rw-r--r--src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java29
-rw-r--r--src/Java/miscutil/core/item/base/plates/BaseItemPlate.java76
-rw-r--r--src/resources/assets/miscutils/textures/items/itemFoodCurriedSausages.png (renamed from src/resources/assets/miscutils/textures/items/itemCurriedSausages.png)bin4417 -> 4417 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/itemFoodRaisinToast.png (renamed from src/resources/assets/miscutils/textures/items/itemRaisinToast.png)bin4596 -> 4596 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/itemPlate.pngbin0 -> 278 bytes
8 files changed, 119 insertions, 33 deletions
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index 563e98a6fb..c232587491 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -4,12 +4,13 @@ import static miscutil.core.creative.AddToCreativeTab.tabMisc;
import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT;
import gregtech.api.util.GT_OreDictUnificator;
import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.item.base.BaseItemHotFood;
import miscutil.core.item.base.CoreItem;
import miscutil.core.item.base.dusts.BaseItemDust;
import miscutil.core.item.base.foods.BaseItemFood;
+import miscutil.core.item.base.foods.BaseItemHotFood;
import miscutil.core.item.base.ingots.BaseItemIngot;
import miscutil.core.item.base.ingots.BaseItemIngotHot;
+import miscutil.core.item.base.plates.BaseItemPlate;
import miscutil.core.item.effects.RarityUncommon;
import miscutil.core.item.general.BufferCore;
import miscutil.core.item.general.fuelrods.FuelRod_Base;
@@ -137,13 +138,16 @@ Gold Tool: 22*/
public static BaseItemIngot itemIngotTantalloy60;
public static BaseItemIngotHot itemHotIngotTantalloy60;
+ public static BaseItemPlate itemPlateTantalloy60;
public static BaseItemIngot itemIngotTantalloy61;
public static BaseItemIngotHot itemHotIngotTantalloy61;
+ public static BaseItemPlate itemPlateTantalloy61;
public static ItemFood itemFoodRaisinToast;
public static BaseItemHotFood itemHotFoodRaisinToast;
public static BaseItemFood itemFoodCurriedSausages;
public static BaseItemHotFood itemHotFoodCurriedSausages;
+
//@SuppressWarnings("unused")
public static final void init(){
@@ -293,13 +297,7 @@ Gold Tool: 22*/
//Staballoy Ingot/Plate
itemIngotStaballoy = new BaseItemIngot("itemIngotStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66));
- GT_OreDictUnificator.registerOre("ingotStaballoy", UtilsItems.getItemStack(CORE.MODID+":itemIngotStaballoy", 1));
- itemPlateStaballoy = new Item().setUnlocalizedName("itemPlateStaballoy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateStaballoy");
- GameRegistry.registerItem(itemPlateStaballoy, "itemPlateStaballoy");
- GT_OreDictUnificator.registerOre("plateStaballoy", UtilsItems.getItemStack(CORE.MODID+":itemPlateStaballoy", 1));
- /*itemIngotStaballoy = new Item().setUnlocalizedName("itemIngotStaballoy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotStaballoy");
- GameRegistry.registerItem(itemIngotStaballoy, "itemIngotStaballoy");
- */
+ itemPlateStaballoy = new BaseItemPlate("itemPlateStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66));
//Staballoy Dusts
@@ -335,14 +333,16 @@ Gold Tool: 22*/
//Hot Tantalloy Ingot
itemHotIngotTantalloy60 = new BaseItemIngotHot("itemHotIngotTantalloy60", "Tantalloy-60", UtilsItems.getItemStack(CORE.MODID+":itemIngotTantalloy60", 1));
GT_OreDictUnificator.registerOre("ingotHotTantalloy-60", UtilsItems.getItemStack(CORE.MODID+":itemHotIngotTantalloy60", 1));
-
+ itemPlateTantalloy60 = new BaseItemPlate("itemPlateTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166));
+
//Tantalloy Ingot/Plate
itemIngotTantalloy61 = new BaseItemIngot("itemIngotTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196));
GT_OreDictUnificator.registerOre("ingotTantalloy-61", UtilsItems.getItemStack(CORE.MODID+":itemIngotTantalloy61", 1));
//Hot Tantalloy Ingot
itemHotIngotTantalloy61 = new BaseItemIngotHot("itemHotIngotTantalloy61", "Tantalloy-61", UtilsItems.getItemStack(CORE.MODID+":itemIngotTantalloy61", 1));
GT_OreDictUnificator.registerOre("ingotHotTantalloy-61", UtilsItems.getItemStack(CORE.MODID+":itemHotIngotTantalloy61", 1));
-
+ itemPlateTantalloy61 = new BaseItemPlate("itemPlateTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196));
+
//Sandstone Hammer
itemSandstoneHammer = new SandstoneHammer("itemSandstoneHammer").setCreativeTab(AddToCreativeTab.tabTools);
GameRegistry.registerItem(itemSandstoneHammer, itemSandstoneHammer.getUnlocalizedName());
@@ -374,24 +374,24 @@ Gold Tool: 22*/
//Raisin Bread
- itemIngotRaisinBread = new BaseItemFood("itemIngotRaisinBread", 3, 1.5f, false, new PotionEffect(Potion.weakness.id, 40, 1)).setAlwaysEdible();
+ itemIngotRaisinBread = new BaseItemFood("itemIngotRaisinBread", "Raisin Bread", 3, 1.5f, false, new PotionEffect(Potion.weakness.id, 40, 1)).setAlwaysEdible();
GT_OreDictUnificator.registerOre("foodRaisinBread", UtilsItems.getItemStack(CORE.MODID+":itemIngotRaisinBread", 1));
//Hot Raisin Bread
itemHotIngotRaisinBread = new BaseItemHotFood("itemHotIngotRaisinBread", 1, 0.5f, "Raisin Bread", 120, itemIngotRaisinBread);
GT_OreDictUnificator.registerOre("foodHotRaisinBread", UtilsItems.getItemStack(CORE.MODID+":itemHotIngotRaisinBread", 1));
//Raisin Bread
- itemFoodRaisinToast = new BaseItemFood("itemFoodRaisinToast", 1, 0.5f, false).setAlwaysEdible();
+ itemFoodRaisinToast = new BaseItemFood("itemFoodRaisinToast", "Raisin Toast", 1, 0.5f, false).setAlwaysEdible();
GT_OreDictUnificator.registerOre("foodRaisinToast", UtilsItems.getItemStack(CORE.MODID+":itemFoodRaisinToast", 1));
//Hot Raisin Bread
itemHotFoodRaisinToast = new BaseItemHotFood("itemHotFoodRaisinToast", 1, 0.5f, "Raisin Toast", 20, itemFoodRaisinToast);
GT_OreDictUnificator.registerOre("foodHotRaisinToast", UtilsItems.getItemStack(CORE.MODID+":itemHotFoodRaisinToast", 1));
//Raisin Bread
- itemFoodCurriedSausages = new BaseItemFood("itemFoodCurriedSausages", 5, 2f, false);
+ itemFoodCurriedSausages = new BaseItemFood("itemFoodCurriedSausages", "Curried Sausages", 5, 2f, false);
GT_OreDictUnificator.registerOre("foodCurriedSausages", UtilsItems.getItemStack(CORE.MODID+":itemFoodCurriedSausages", 1));
//Hot Raisin Bread
- itemHotFoodCurriedSausages = new BaseItemHotFood("itemHotFoodCurriedSausages", 1, 0.5f, "Raisin Bread", 240, itemFoodCurriedSausages);
+ itemHotFoodCurriedSausages = new BaseItemHotFood("itemHotFoodCurriedSausages", 1, 0.5f, "Curried Sausages", 240, itemFoodCurriedSausages);
GT_OreDictUnificator.registerOre("foodHotCurriedSausages", UtilsItems.getItemStack(CORE.MODID+":itemHotFoodCurriedSausages", 1));
}
} \ No newline at end of file
diff --git a/src/Java/miscutil/core/item/base/foods/BaseItemFood.java b/src/Java/miscutil/core/item/base/foods/BaseItemFood.java
index 1b67fce1ae..34e332e629 100644
--- a/src/Java/miscutil/core/item/base/foods/BaseItemFood.java
+++ b/src/Java/miscutil/core/item/base/foods/BaseItemFood.java
@@ -12,13 +12,15 @@ import cpw.mods.fml.common.registry.GameRegistry;
public class BaseItemFood extends ItemFood {
private PotionEffect[] effects;
+ protected String localName;
- public BaseItemFood(String unlocalizedName, int healAmount, float saturationModifier, boolean wolvesFavorite, PotionEffect... effects) {
+ public BaseItemFood(String unlocalizedName, String localizedName, int healAmount, float saturationModifier, boolean wolvesFavorite, PotionEffect... effects) {
super(healAmount, saturationModifier, wolvesFavorite);
this.setUnlocalizedName(unlocalizedName);
- this.setTextureName(CORE.MODID + ":" + unlocalizedName);
+ this.setTextureName(CORE.MODID + ":" + unlocalizedName.replace("Hot", ""));
this.setCreativeTab(AddToCreativeTab.tabMisc);
this.effects = effects;
+ this.localName = localizedName;
GameRegistry.registerItem(this, unlocalizedName);
}
@@ -35,5 +37,11 @@ public class BaseItemFood extends ItemFood {
);
}
}
+
+ @Override
+ public String getItemStackDisplayName(ItemStack p_77653_1_) {
+
+ return ("A Serving of "+localName);
+ }
} \ No newline at end of file
diff --git a/src/Java/miscutil/core/item/base/BaseItemHotFood.java b/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java
index b6751e8485..1632df582a 100644
--- a/src/Java/miscutil/core/item/base/BaseItemHotFood.java
+++ b/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java
@@ -1,8 +1,7 @@
-package miscutil.core.item.base;
+package miscutil.core.item.base.foods;
import java.util.List;
-import miscutil.core.item.base.foods.BaseItemFood;
import miscutil.core.util.Utils;
import miscutil.core.util.UtilsText;
import miscutil.core.util.item.UtilsItems;
@@ -22,7 +21,7 @@ public class BaseItemHotFood extends BaseItemFood{
protected Item output;
public BaseItemHotFood(String unlocalizedName, int healAmount, float healSaturation, String foodName, int timeToCoolInSeconds, Item cooledFood) {
- super(unlocalizedName, healAmount, healSaturation, false);
+ super(unlocalizedName, "Hot "+foodName, healAmount, healSaturation, false);
this.unlocalName = unlocalizedName;
this.cooldownTime = timeToCoolInSeconds * 20;
this.materialName = foodName;
@@ -72,7 +71,7 @@ public class BaseItemHotFood extends BaseItemFood{
@Override
public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
- return Utils.rgbtoHexValue(255, 128, 128);
+ return Utils.rgbtoHexValue(230, 96, 96);
}
}
diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
index dee7786f6f..26245f1a04 100644
--- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
+++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
@@ -1,6 +1,7 @@
package miscutil.core.item.base.ingots;
import gregtech.api.enums.GT_Values;
+import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import java.util.List;
@@ -27,17 +28,22 @@ public class BaseItemIngot extends Item{
this.setUnlocalizedName(unlocalizedName);
this.unlocalName = unlocalizedName;
this.setMaxStackSize(64);
- if (unlocalizedName.contains("RaisinBread")){
- this.setTextureName(CORE.MODID + ":" + "itemBread");
- }
- else {
- this.setTextureName(CORE.MODID + ":" + "itemIngot");
- }
+ this.setTextureName(CORE.MODID + ":" + "itemIngot");
this.setMaxStackSize(64);
this.colour = colour;
this.materialName = materialName;
GameRegistry.registerItem(this, unlocalizedName);
- addBendingRecipe();
+ String temp = "";
+ if (unlocalName.contains("itemIngot")){
+ temp = unlocalName.replace("itemI", "i");
+ }
+ if (unlocalName.contains("itemHotIngot")){
+ temp = unlocalName.replace("itemHotIngot", "ingotHot");
+ }
+ if (temp != null && temp != ""){
+ GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this));
+ }
+ //addBendingRecipe();
}
@Override
@@ -48,15 +54,12 @@ public class BaseItemIngot extends Item{
@Override
public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
- if (materialName != null && materialName != "" && !materialName.equals("") && !unlocalName.contains("HotIngot") && !unlocalName.toLowerCase().contains("raisinbread")){
+ if (materialName != null && materialName != "" && !materialName.equals("") && !unlocalName.contains("HotIngot")){
list.add(EnumChatFormatting.GRAY+"A solid ingot of " + materialName + ".");
}
- else if (materialName != null && materialName != "" && !materialName.equals("") && unlocalName.toLowerCase().contains("ingothot") && !unlocalName.toLowerCase().contains("raisinbread")){
+ else if (materialName != null && materialName != "" && !materialName.equals("") && unlocalName.toLowerCase().contains("ingothot")){
list.add(EnumChatFormatting.GRAY+"Warning: Very hot! Avoid direct handling..");
}
- else if (materialName != null && materialName != "" && !materialName.equals("") && !unlocalName.toLowerCase().contains("ingothot") && unlocalName.toLowerCase().contains("raisinbread")){
- list.add(EnumChatFormatting.GRAY+"We all know that " + materialName + " is delicious!");
- }
super.addInformation(stack, aPlayer, list, bool);
}
@@ -74,7 +77,7 @@ public class BaseItemIngot extends Item{
}
private void addBendingRecipe(){
- if (!unlocalName.toLowerCase().contains("ingothot") && !unlocalName.toLowerCase().contains("raisinbread")){
+ if (!unlocalName.toLowerCase().contains("ingothot")){
GT_Values.RA.addBenderRecipe(GT_Utility.copyAmount(1L, new Object[]{this}),
UtilsItems.getItemStackOfAmountFromOreDict("plate"+materialName, 1),
1200, 24);
diff --git a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java
new file mode 100644
index 0000000000..07c5a99f11
--- /dev/null
+++ b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java
@@ -0,0 +1,76 @@
+package miscutil.core.item.base.plates;
+
+import gregtech.api.enums.GT_Values;
+import gregtech.api.util.GT_OreDictUnificator;
+
+import java.util.List;
+
+import miscutil.core.creative.AddToCreativeTab;
+import miscutil.core.lib.CORE;
+import miscutil.core.util.Utils;
+import miscutil.core.util.item.UtilsItems;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public class BaseItemPlate extends Item{
+
+ protected int colour;
+ protected String materialName;
+ protected String unlocalName;
+
+ public BaseItemPlate(String unlocalizedName, String materialName, int colour) {
+ setUnlocalizedName(unlocalizedName);
+ this.setCreativeTab(AddToCreativeTab.tabMisc);
+ this.setUnlocalizedName(unlocalizedName);
+ this.unlocalName = unlocalizedName;
+ this.setMaxStackSize(64);
+ this.setTextureName(CORE.MODID + ":" + "itemPlate");
+ this.setMaxStackSize(64);
+ this.colour = colour;
+ this.materialName = materialName;
+ GameRegistry.registerItem(this, unlocalizedName);
+ GT_OreDictUnificator.registerOre(unlocalName.replace("itemP", "p"), UtilsItems.getSimpleStack(this));
+ addBendingRecipe();
+ }
+
+ @Override
+ public String getItemStackDisplayName(ItemStack p_77653_1_) {
+
+ return (materialName+ " Plate");
+ }
+
+ @Override
+ public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
+ if (materialName != null && materialName != "" && !materialName.equals("")){
+ list.add(EnumChatFormatting.GRAY+"A flat plate of " + materialName + ".");
+ }
+ super.addInformation(stack, aPlayer, list, bool);
+ }
+
+ public final String getMaterialName() {
+ return materialName;
+ }
+
+ @Override
+ public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
+ if (colour == 0){
+ return Utils.generateSingularRandomHexValue();
+ }
+ return colour;
+
+ }
+
+ private void addBendingRecipe(){
+ String tempIngot = unlocalName.replace("itemPlate", "ingot");
+ ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
+ if (null != tempOutputStack){
+ GT_Values.RA.addBenderRecipe(UtilsItems.getSimpleStack(this),
+ tempOutputStack,
+ 1200, 24);
+ }
+ }
+
+}
diff --git a/src/resources/assets/miscutils/textures/items/itemCurriedSausages.png b/src/resources/assets/miscutils/textures/items/itemFoodCurriedSausages.png
index edb649ce9f..edb649ce9f 100644
--- a/src/resources/assets/miscutils/textures/items/itemCurriedSausages.png
+++ b/src/resources/assets/miscutils/textures/items/itemFoodCurriedSausages.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/itemRaisinToast.png b/src/resources/assets/miscutils/textures/items/itemFoodRaisinToast.png
index be14940e7f..be14940e7f 100644
--- a/src/resources/assets/miscutils/textures/items/itemRaisinToast.png
+++ b/src/resources/assets/miscutils/textures/items/itemFoodRaisinToast.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/itemPlate.png b/src/resources/assets/miscutils/textures/items/itemPlate.png
new file mode 100644
index 0000000000..b5a9ab5214
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemPlate.png
Binary files differ
generated by cgit (git 2.46.0) at 2025-03-12 06:07:19 +0000