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

patched up shredder recipe shenanigans

Browse Source
This commit is contained in:
Boblet 2021-08-11 13:47:09 +02:00
parent 48aa499cfb
commit c0b64abbeb
2 changed files with 55 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/hbm/inventory/RecipesCommon.java
View File

@ -3,7 +3,10 @@ package com.hbm.inventory;
import java.util.Arrays;
import java.util.List;
import com.hbm.main.MainRegistry;
import net.minecraft.block.Block;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -166,6 +169,13 @@ public class RecipesCommon {
@Override
public int hashCode() {
if(item == null) {
MainRegistry.logger.error("ComparableStack has a null item! This is a serious issue!");
Thread.currentThread().dumpStack();
item = Items.stick;
}
final int prime = 31;
int result = 1;
result = prime * result + Item.itemRegistry.getNameForObject(item).hashCode(); //using the int ID will cause fucky-wuckys if IDs are scrambled

115
src/main/java/com/hbm/inventory/ShredderRecipes.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import java.util.Map;
import com.hbm.blocks.ModBlocks;
import com.hbm.interfaces.Untested;
import com.hbm.inventory.RecipesCommon.ComparableStack;
import com.hbm.items.ModItems;
import com.hbm.main.MainRegistry;
@ -39,82 +40,56 @@ public class ShredderRecipes {
if(matches == null || matches.isEmpty())
continue;
if(name.length() > 5 && name.substring(0, 5).equals("ingot")) {
ItemStack dust = getDustByName(name.substring(5));
if(dust != null && dust.getItem() != ModItems.scrap) {
for(ItemStack stack : matches) {
if(stack != null)
shredderRecipes.put(new ComparableStack(stack), dust);
else
MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!");
}
}
} else if(name.length() > 3 && name.substring(0, 3).equals("ore")) {
ItemStack dust = getDustByName(name.substring(3));
if(dust != null && dust.getItem() != ModItems.scrap) {
dust.stackSize = 2;
for(ItemStack stack : matches) {
if(stack != null)
shredderRecipes.put(new ComparableStack(stack), dust);
else
MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!");
}
}
} else if(name.length() > 5 && name.substring(0, 5).equals("block")) {
ItemStack dust = getDustByName(name.substring(5));
if(dust != null && dust.getItem() != ModItems.scrap) {
dust.stackSize = 9;
for(ItemStack stack : matches) {
if(stack != null)
shredderRecipes.put(new ComparableStack(stack), dust);
else
MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!");
}
}
} else if(name.length() > 3 && name.substring(0, 3).equals("gem")) {
ItemStack dust = getDustByName(name.substring(3));
if(dust != null && dust.getItem() != ModItems.scrap) {
for(ItemStack stack : matches) {
if(stack != null)
shredderRecipes.put(new ComparableStack(stack), dust);
else
MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!");
}
}
} else if(name.length() > 7 && name.substring(0, 7).equals("crystal")) {
ItemStack dust = getDustByName(name.substring(7));
if(dust != null && dust.getItem() != ModItems.scrap) {
for(ItemStack stack : matches) {
if(stack != null)
shredderRecipes.put(new ComparableStack(stack), dust);
else
MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!");
}
}
} else if(name.length() > 3 && name.substring(0, 4).equals("dust")) {
generateRecipes("ingot", name, matches, 1);
generateRecipes("ore", name, matches, 2);
generateRecipes("block", name, matches, 9);
generateRecipes("gem", name, matches, 1);
generateRecipes("crystal", name, matches, 1);
if(name.length() > 3 && name.substring(0, 4).equals("dust")) {
for(ItemStack stack : matches) {
if(stack != null)
shredderRecipes.put(new ComparableStack(stack), new ItemStack(ModItems.dust));
else
MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!");
putIfValid(stack, new ItemStack(ModItems.dust), name);
}
}
}
}
@Untested
private static void generateRecipes(String prefix, String name, List<ItemStack> matches, int outCount) {
int len = prefix.length();
if(name.length() > len && name.substring(0, len).equals(prefix)) {
ItemStack dust = getDustByName(name.substring(len));
if(dust != null && dust.getItem() != ModItems.scrap) {
dust.stackSize = outCount;
for(ItemStack stack : matches) {
putIfValid(stack, dust, name);
}
}
}
}
private static void putIfValid(ItemStack in, ItemStack dust, String name) {
if(in != null) {
if(in.getItem() != null) {
shredderRecipes.put(new ComparableStack(in), dust);
} else {
MainRegistry.logger.error("Ore dict entry '" + name + "' has a null item in its stack! How does that even happen?");
Thread.currentThread().dumpStack();
}
} else {
MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!");
Thread.currentThread().dumpStack();
}
}
public static void registerOverrides() {
ShredderRecipes.setRecipe(ModItems.scrap, new ItemStack(ModItems.dust));