xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2235 from MerrittK/shredder_dust_fix

Browse Source 
Shredder Preferential Ore registry.
This commit is contained in:
HbmMods 2025-06-28 19:21:12 +02:00 committed by GitHub
commit 942f7fefea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/hbm/config/CommonConfig.java
View File

@ -81,8 +81,8 @@ public class CommonConfig {
prop.comment = comment;
return prop.getIntList();
}
public static String[] createConfigStringList(Configuration config, String category, String name, String comment) {
Property prop = config.get(category, name, new String[] { "PLACEHOLDER" });
public static String[] createConfigStringList(Configuration config, String category, String name, String comment, String[] def) {
Property prop = config.get(category, name, def);
prop.comment = comment;
return prop.getStringList();
}

6
src/main/java/com/hbm/config/GeneralConfig.java
View File

@ -1,7 +1,7 @@
package com.hbm.config;
import net.minecraftforge.common.config.Configuration;
import com.hbm.lib.RefStrings;
public class GeneralConfig {
public static boolean enableThermosPreventer = true;
@ -70,6 +70,7 @@ public class GeneralConfig {
public static boolean enableLBSMSafeMEDrives = true;
public static boolean enableLBSMIGen = true;
public static int schrabRate = 20;
public static String[] preferredOutputMod = new String[] {RefStrings.MODID};
public static void loadFromConfig(Configuration config) {
@ -117,7 +118,8 @@ public class GeneralConfig {
normalSoundChannels = CommonConfig.createConfigInt(config, CATEGORY_GENERAL, "1.41_normalSoundChannels",
"The amount of channels to create while 1.39_enableSoundExtension is enabled.\n" +
"Note that a value below 28 or above 200 can cause buggy sounds and issues with other mods running out of sound memory.", 100);
preferredOutputMod = CommonConfig.createConfigStringList(config,CATEGORY_GENERAL,"1.42_preferredOutputMod",
"The mod which is preferred as output when certain machines autogenerate recipes. Currently used for the shredder", new String[] {RefStrings.MODID});
enableExpensiveMode = config.get(CATEGORY_GENERAL, "1.99_enableExpensiveMode", false, "It does what the name implies.").getBoolean(false);
final String CATEGORY_528 = CommonConfig.CATEGORY_528;

9
src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java
View File

@ -360,9 +360,9 @@ public class ShredderRecipes extends SerializableRecipe {
/* AR COMPAT */
Block arMoonTurf = Compat.tryLoadBlock(Compat.MOD_AR, "turf");
if(arMoonTurf != null && gcMoonBlock != Blocks.air) ShredderRecipes.setRecipe(arMoonTurf, new ItemStack(ModBlocks.moon_turf)); //i assume it's moon turf
if(arMoonTurf != null && arMoonTurf != Blocks.air) ShredderRecipes.setRecipe(arMoonTurf, new ItemStack(ModBlocks.moon_turf)); //i assume it's moon turf
Block arMoonTurfDark = Compat.tryLoadBlock(Compat.MOD_AR, "turfDark");
if(arMoonTurfDark != null && gcMoonBlock != Blocks.air) ShredderRecipes.setRecipe(arMoonTurfDark, new ItemStack(ModBlocks.moon_turf)); //probably moon dirt? would have helped if i had ever played AR for more than 5 seconds
if(arMoonTurfDark != null && arMoonTurfDark != Blocks.air) ShredderRecipes.setRecipe(arMoonTurfDark, new ItemStack(ModBlocks.moon_turf)); //probably moon dirt? would have helped if i had ever played AR for more than 5 seconds
}
/**
@ -374,8 +374,9 @@ public class ShredderRecipes extends SerializableRecipe {
List<ItemStack> matches = OreDictionary.getOres("dust" + name);
if(matches != null && !matches.isEmpty())
return matches.get(0).copy();
if(matches != null && !matches.isEmpty()) {
return Compat.getPreferredOreOutput(matches);
}
return new ItemStack(ModItems.scrap);
}

24
src/main/java/com/hbm/util/Compat.java
View File

@ -49,7 +49,29 @@ public class Compat {
private static String getReg(String domain, String name) {
return domain + ":" + name;
}
public static ItemStack getPreferredOreOutput(List<ItemStack> oreList) {
int lowestPref = -1;
ItemStack preferredStack = null;
for(ItemStack item : oreList) {
String modid = ItemStackUtil.getModIdFromItemStack(item);
for(int i = 0; i < GeneralConfig.preferredOutputMod.length; i++) {
if (modid.equals(GeneralConfig.preferredOutputMod[i])){
if (lowestPref<0 || i <lowestPref) {
preferredStack = item;
lowestPref = i;
}
break;
}
}
}
if (preferredStack != null) {
return preferredStack.copy();
}
return oreList.get(0).copy();
}
public static boolean isModLoaded(String modid) {
return Loader.isModLoaded(modid);
}

16
src/main/java/com/hbm/util/ItemStackUtil.java
View File

@ -15,6 +15,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
public class ItemStackUtil {
public static ItemStack carefulCopy(ItemStack stack) {
@ -166,6 +169,19 @@ public class ItemStackUtil {
return list;
}
/**
* Returns a String of the mod id of an itemstack. If a unique identifier can't be found in the registry, returns null.
* @param stack
* @return
*/
public static String getModIdFromItemStack(ItemStack stack) {
UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor(stack.getItem());
if(id!=null) {
return id.modId;
}
return null;
}
public static void spillItems(World world, int x, int y, int z, Block block, Random rand) {
IInventory tileentityfurnace = (IInventory) world.getTileEntity(x, y, z);