mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-22 13:09:53 +00:00
Fix JABBA-related issues with crafting station slots (#54)
* Fix shift-merging tools voiding items fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11392> * Change 0-sized ItemStacks into null stacks in crafting station attached slots Fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10425> * Update buildscript * spotlessApply
This commit is contained in:
1 parent
18bfeaff32
commit
39be06c23b
571 files changed
+25959
-28223
No files matched your search
@@ -11,8 +11,7 @@ import tconstruct.library.event.PartBuilderEvent;
|
||||
import tconstruct.library.tools.CustomMaterial;
|
||||
import tconstruct.library.util.IPattern;
|
||||
|
||||
public class PatternBuilder
|
||||
{
|
||||
public class PatternBuilder {
|
||||
public static PatternBuilder instance = new PatternBuilder();
|
||||
// Map items to their parts with a hashmap
|
||||
public List<ItemKey> materials = new ArrayList<ItemKey>();
|
||||
@@ -22,73 +21,57 @@ public class PatternBuilder
|
||||
public List<IPattern> toolPatterns = new ArrayList<IPattern>();
|
||||
|
||||
/* Register methods */
|
||||
public void registerMaterial (ItemStack material, int value, String key)
|
||||
{
|
||||
public void registerMaterial(ItemStack material, int value, String key) {
|
||||
materials.add(new ItemKey(material.getItem(), material.getItemDamage(), value, key));
|
||||
}
|
||||
|
||||
public void registerMaterialSet (String key, ItemStack shard, ItemStack rod, int materialID)
|
||||
{
|
||||
public void registerMaterialSet(String key, ItemStack shard, ItemStack rod, int materialID) {
|
||||
materialSets.put(key, new MaterialSet(shard, rod, materialID));
|
||||
materials.add(new ItemKey(shard.getItem(), shard.getItemDamage(), 1, key));
|
||||
}
|
||||
|
||||
public void registerFullMaterial (ItemStack material, int value, String key, ItemStack shard, ItemStack rod, int materialID)
|
||||
{
|
||||
public void registerFullMaterial(
|
||||
ItemStack material, int value, String key, ItemStack shard, ItemStack rod, int materialID) {
|
||||
materials.add(new ItemKey(material.getItem(), material.getItemDamage(), value, key));
|
||||
materials.add(new ItemKey(shard.getItem(), shard.getItemDamage(), 1, key));
|
||||
materialSets.put(key, new MaterialSet(shard, rod, materialID));
|
||||
}
|
||||
|
||||
public void addToolPattern (IPattern item)
|
||||
{
|
||||
public void addToolPattern(IPattern item) {
|
||||
toolPatterns.add(item);
|
||||
}
|
||||
|
||||
/* Build tool parts from patterns */
|
||||
public ItemStack[] getToolPart (ItemStack material, ItemStack pattern, ItemStack otherPattern)
|
||||
{
|
||||
if (material != null && pattern != null)
|
||||
{
|
||||
public ItemStack[] getToolPart(ItemStack material, ItemStack pattern, ItemStack otherPattern) {
|
||||
if (material != null && pattern != null) {
|
||||
PartBuilderEvent.NormalPart event = new PartBuilderEvent.NormalPart(material, pattern, otherPattern);
|
||||
MinecraftForge.EVENT_BUS.post(event);
|
||||
|
||||
if (event.getResult() == Result.ALLOW)
|
||||
{
|
||||
if (event.getResult() == Result.ALLOW) {
|
||||
return event.getResultStacks();
|
||||
}
|
||||
else if (event.getResult() == Result.DENY)
|
||||
{
|
||||
} else if (event.getResult() == Result.DENY) {
|
||||
return null;
|
||||
}
|
||||
|
||||
ItemKey key = getItemKey(material);
|
||||
if (key != null)
|
||||
{
|
||||
if (key != null) {
|
||||
MaterialSet mat = (MaterialSet) materialSets.get(key.key);
|
||||
ItemStack toolPart = getMatchingPattern(pattern, material, mat);
|
||||
|
||||
if (toolPart != null)
|
||||
{
|
||||
if (toolPart != null) {
|
||||
int patternValue = ((IPattern) pattern.getItem()).getPatternCost(pattern);
|
||||
int totalMaterial = key.value * material.stackSize;
|
||||
|
||||
if (totalMaterial < patternValue) // Not enough material
|
||||
return null;
|
||||
|
||||
return null;
|
||||
else if (patternValue == key.value) // Material only
|
||||
return new ItemStack[] { toolPart, null };
|
||||
|
||||
else
|
||||
{
|
||||
if (patternValue % 2 == 1 && mat.shard != null)
|
||||
{
|
||||
return new ItemStack[] { toolPart, mat.shard.copy() }; // Material
|
||||
// +
|
||||
// shard
|
||||
}
|
||||
else
|
||||
return new ItemStack[] { toolPart, null };
|
||||
return new ItemStack[] {toolPart, null};
|
||||
else {
|
||||
if (patternValue % 2 == 1 && mat.shard != null) {
|
||||
return new ItemStack[] {toolPart, mat.shard.copy()}; // Material
|
||||
// +
|
||||
// shard
|
||||
} else return new ItemStack[] {toolPart, null};
|
||||
}
|
||||
/*
|
||||
* if ( patternValue < totalMaterial ) { if (otherPattern !=
|
||||
@@ -99,11 +82,11 @@ public class PatternBuilder
|
||||
* otherPart = getMatchingPattern(otherPattern, mat); return
|
||||
* new ItemStack[] { toolPart, otherPart }; //Material +
|
||||
* Material } } }
|
||||
*
|
||||
*
|
||||
* else if ( patternValue == key.value ) return new
|
||||
* ItemStack[] { new ItemStack(toolPart, 1, mat.materialID),
|
||||
* null }; //Material only
|
||||
*
|
||||
*
|
||||
* else return null; //Not a valid match
|
||||
*/
|
||||
}
|
||||
@@ -112,13 +95,10 @@ public class PatternBuilder
|
||||
return null;
|
||||
}
|
||||
|
||||
public int getPartID (ItemStack material)
|
||||
{
|
||||
if (material != null)
|
||||
{
|
||||
public int getPartID(ItemStack material) {
|
||||
if (material != null) {
|
||||
ItemKey key = getItemKey(material);
|
||||
if (key != null)
|
||||
{
|
||||
if (key != null) {
|
||||
MaterialSet set = (MaterialSet) materialSets.get(key.key);
|
||||
return set.materialID;
|
||||
}
|
||||
@@ -126,73 +106,56 @@ public class PatternBuilder
|
||||
return Short.MAX_VALUE;
|
||||
}
|
||||
|
||||
public int getPartValue (ItemStack material)
|
||||
{
|
||||
if (material != null)
|
||||
{
|
||||
public int getPartValue(ItemStack material) {
|
||||
if (material != null) {
|
||||
ItemKey key = getItemKey(material);
|
||||
if (key != null)
|
||||
return key.value;
|
||||
if (key != null) return key.value;
|
||||
|
||||
for (CustomMaterial mat : TConstructRegistry.customMaterials)
|
||||
{
|
||||
if (mat.matches(material))
|
||||
return mat.value;
|
||||
for (CustomMaterial mat : TConstructRegistry.customMaterials) {
|
||||
if (mat.matches(material)) return mat.value;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public ItemKey getItemKey (ItemStack material)
|
||||
{
|
||||
public ItemKey getItemKey(ItemStack material) {
|
||||
Item mat = material.getItem();
|
||||
int damage = material.getItemDamage();
|
||||
for (ItemKey ik : materials)
|
||||
{
|
||||
if (mat == ik.item && (ik.damage == Short.MAX_VALUE || damage == ik.damage))
|
||||
return ik;
|
||||
for (ItemKey ik : materials) {
|
||||
if (mat == ik.item && (ik.damage == Short.MAX_VALUE || damage == ik.damage)) return ik;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public ItemStack getMatchingPattern (ItemStack stack, ItemStack input, MaterialSet set)
|
||||
{
|
||||
public ItemStack getMatchingPattern(ItemStack stack, ItemStack input, MaterialSet set) {
|
||||
Item item = stack.getItem();
|
||||
for (IPattern pattern : toolPatterns)
|
||||
{
|
||||
if (pattern == item)
|
||||
return pattern.getPatternOutput(stack, input, set);
|
||||
for (IPattern pattern : toolPatterns) {
|
||||
if (pattern == item) return pattern.getPatternOutput(stack, input, set);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public ItemStack getShardFromSet (String materialset)
|
||||
{
|
||||
public ItemStack getShardFromSet(String materialset) {
|
||||
MaterialSet set = (MaterialSet) materialSets.get(materialset);
|
||||
if (set != null && set.shard != null)
|
||||
return set.shard.copy();
|
||||
if (set != null && set.shard != null) return set.shard.copy();
|
||||
return null;
|
||||
}
|
||||
|
||||
public ItemStack getRodFromSet (String materialset)
|
||||
{
|
||||
public ItemStack getRodFromSet(String materialset) {
|
||||
MaterialSet set = (MaterialSet) materialSets.get(materialset);
|
||||
if (set != null)
|
||||
return set.rod.copy();
|
||||
if (set != null) return set.rod.copy();
|
||||
return null;
|
||||
}
|
||||
|
||||
// Small data classes. I would prefer the struct from C#, but we do what we
|
||||
// can.
|
||||
public class ItemKey
|
||||
{
|
||||
public class ItemKey {
|
||||
public final Item item;
|
||||
public final int damage;
|
||||
public final int value;
|
||||
public final String key;
|
||||
|
||||
public ItemKey(Item i, int d, int v, String s)
|
||||
{
|
||||
public ItemKey(Item i, int d, int v, String s) {
|
||||
item = i;
|
||||
damage = d;
|
||||
value = v;
|
||||
@@ -200,14 +163,12 @@ public class PatternBuilder
|
||||
}
|
||||
}
|
||||
|
||||
public class MaterialSet
|
||||
{
|
||||
public class MaterialSet {
|
||||
public final ItemStack shard;
|
||||
public final ItemStack rod;
|
||||
public final int materialID;
|
||||
|
||||
public MaterialSet(ItemStack s, ItemStack r, int id)
|
||||
{
|
||||
public MaterialSet(ItemStack s, ItemStack r, int id) {
|
||||
shard = s;
|
||||
rod = r;
|
||||
materialID = id;
|
||||
@@ -215,23 +176,21 @@ public class PatternBuilder
|
||||
}
|
||||
|
||||
// Helper Methods
|
||||
public void registerMaterial (Block material, int value, String key)
|
||||
{
|
||||
public void registerMaterial(Block material, int value, String key) {
|
||||
registerMaterial(new ItemStack(material, 1, Short.MAX_VALUE), value, key);
|
||||
}
|
||||
|
||||
public void registerMaterial (Item material, int value, String key)
|
||||
{
|
||||
public void registerMaterial(Item material, int value, String key) {
|
||||
registerMaterial(new ItemStack(material, 1, Short.MAX_VALUE), value, key);
|
||||
}
|
||||
|
||||
public void registerFullMaterial (Block material, int value, String key, ItemStack shard, ItemStack rod, int materialID)
|
||||
{
|
||||
public void registerFullMaterial(
|
||||
Block material, int value, String key, ItemStack shard, ItemStack rod, int materialID) {
|
||||
registerFullMaterial(new ItemStack(material, 1, Short.MAX_VALUE), value, key, shard, rod, materialID);
|
||||
}
|
||||
|
||||
public void registerFullMaterial (Item material, int value, String key, ItemStack shard, ItemStack rod, int materialID)
|
||||
{
|
||||
public void registerFullMaterial(
|
||||
Item material, int value, String key, ItemStack shard, ItemStack rod, int materialID) {
|
||||
registerFullMaterial(new ItemStack(material, 1, Short.MAX_VALUE), value, key, shard, rod, materialID);
|
||||
}
|
||||
|
||||
@@ -241,11 +200,11 @@ public class PatternBuilder
|
||||
* Short.MAX_VALUE), value, key, new ItemStack(TContent.toolShard, 1,
|
||||
* materialID), new ItemStack(TContent.toolRod, 1, materialID), materialID);
|
||||
* }
|
||||
*
|
||||
*
|
||||
* public void registerFullMaterial (Item material, int value, String key,
|
||||
* int materialID) { registerFullMaterial(new ItemStack(material, 1,
|
||||
* Short.MAX_VALUE), value, key, new ItemStack(TContent.toolShard, 1,
|
||||
* materialID), new ItemStack(TContent.toolRod, 1, materialID), materialID);
|
||||
* }
|
||||
*/
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user