Skip to content

Commit 4714a02

Browse files
committed
Document raw item/fluid equality ignore quantities
1 parent 08b6855 commit 4714a02

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

  • src/main
    • java/org/cyclops/integrateddynamics/core/evaluate/operator
    • resources/assets/integrateddynamics/lang

src/main/java/org/cyclops/integrateddynamics/core/evaluate/operator/Operators.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1724,7 +1724,7 @@ public IValue evaluate(OperatorBase.SafeVariablesGetter variables) throws Evalua
17241724
}).build());
17251725

17261726
/**
1727-
* If the raw items of the given stacks are equal, ignoring data components but including damage value.
1727+
* If the raw items of the given stacks are equal, ignoring data components and item count but including damage value.
17281728
*/
17291729
public static final IOperator OBJECT_ITEMSTACK_ISITEMEQUALNODATA = REGISTRY.register(OperatorBuilders.ITEMSTACK_2
17301730
.output(ValueTypes.BOOLEAN).symbol("=NoNBT=").operatorName("isitemequalnonbt").interactName("isEqualNonNbt")
@@ -1743,7 +1743,7 @@ public IValue evaluate(OperatorBase.SafeVariablesGetter variables) throws Evalua
17431743
}).build());
17441744

17451745
/**
1746-
* If the raw items of the given stacks are equal, ignoring data components and damage value.
1746+
* If the raw items of the given stacks are equal, ignoring data components, item count, and damage value.
17471747
*/
17481748
public static final IOperator OBJECT_ITEMSTACK_ISRAWITEMEQUAL = REGISTRY.register(OperatorBuilders.ITEMSTACK_2
17491749
.output(ValueTypes.BOOLEAN).symbol("=Raw=").operatorName("israwitemequal").interactName("isEqualRaw")
@@ -2796,7 +2796,7 @@ public IValue evaluate(OperatorBase.SafeVariablesGetter variables) throws Evalua
27962796
}).build());
27972797

27982798
/**
2799-
* If the fluid types of the two given fluidstacks are equal
2799+
* If the fluid types of the two given fluidstacks are equal, ignoring quantities
28002800
*/
28012801
public static final IOperator OBJECT_FLUIDSTACK_ISRAWFLUIDEQUAL = REGISTRY.register(OperatorBuilders.FLUIDSTACK_2
28022802
.output(ValueTypes.BOOLEAN).symbol("=Raw=").operatorName("israwfluidequal").interactName("isRawEqual")

src/main/resources/assets/integrateddynamics/lang/en_us.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,9 +1240,9 @@
12401240
"operator.integrateddynamics.itemstack.isnbtequal": "NBT equals",
12411241
"operator.integrateddynamics.itemstack.isnbtequal.info": "If the data components of the given items are equal",
12421242
"operator.integrateddynamics.itemstack.isitemequalnonbt": "Raw item equals no NBT",
1243-
"operator.integrateddynamics.itemstack.isitemequalnonbt.info": "If the raw items of the given stacks are equal, ignoring data components but including damage values.",
1243+
"operator.integrateddynamics.itemstack.isitemequalnonbt.info": "If the raw items of the given stacks are equal, ignoring data components and item count but including damage values.",
12441244
"operator.integrateddynamics.itemstack.israwitemequal": "Raw item equals",
1245-
"operator.integrateddynamics.itemstack.israwitemequal.info": "If the raw items of the given items are equal, ignoring NBT and damage values.",
1245+
"operator.integrateddynamics.itemstack.israwitemequal.info": "If the raw items of the given items are equal, ignoring NBT, item count, and damage values.",
12461246
"operator.integrateddynamics.itemstack.mod": "Mod",
12471247
"operator.integrateddynamics.itemstack.mod.info": "The name of the mod owning the given item",
12481248
"operator.integrateddynamics.itemstack.burntime": "Fuel Burn Time",
@@ -1394,7 +1394,7 @@
13941394
"operator.integrateddynamics.fluidstack.bucket": "Bucket",
13951395
"operator.integrateddynamics.fluidstack.bucket.info": "The filled bucket for the fluid",
13961396
"operator.integrateddynamics.fluidstack.israwfluidequal": "Raw fluid equals",
1397-
"operator.integrateddynamics.fluidstack.israwfluidequal.info": "If the raw fluids are equal",
1397+
"operator.integrateddynamics.fluidstack.israwfluidequal.info": "If the raw fluids are equal, ignoring quantity",
13981398
"operator.integrateddynamics.fluidstack.mod": "Mod",
13991399
"operator.integrateddynamics.fluidstack.mod.info": "The name of the mod owning the given fluid",
14001400
"operator.integrateddynamics.fluidstack.nbt": "Fluid NBT",

0 commit comments

Comments
 (0)