Make all material property setters return themselves to allow method chaining (GregTechCEu#2820)

Zorbatron · web-flow · commit 96b0dccfb3a2 · 2025-06-17T18:54:41.000-07:00
diff --git a/src/main/java/gregtech/api/capability/IPropertyFluidFilter.java b/src/main/java/gregtech/api/capability/IPropertyFluidFilter.java
@@ -25,7 +25,7 @@
  * @see gregtech.api.fluids.attribute.FluidAttributes
  * @see AttributedFluid
  */
-public interface IPropertyFluidFilter extends IFilter<FluidStack> {
+public interface IPropertyFluidFilter<R> extends IFilter<FluidStack> {
 
     @Override
     default boolean test(@NotNull FluidStack stack) {
@@ -79,7 +79,7 @@ default int getPriority() {
      * @param attribute  the attribute to change containment status for
      * @param canContain whether the attribute can be contained
      */
-    void setCanContain(@NotNull FluidAttribute attribute, boolean canContain);
+    R setCanContain(@NotNull FluidAttribute attribute, boolean canContain);
 
     @NotNull
     @UnmodifiableView
diff --git a/src/main/java/gregtech/api/capability/impl/PropertyFluidFilter.java b/src/main/java/gregtech/api/capability/impl/PropertyFluidFilter.java
@@ -12,7 +12,7 @@
 
 import java.util.Collection;
 
-public class PropertyFluidFilter implements IPropertyFluidFilter {
+public class PropertyFluidFilter implements IPropertyFluidFilter<PropertyFluidFilter> {
 
     private final Object2BooleanMap<FluidAttribute> containmentPredicate = new Object2BooleanOpenHashMap<>();
 
@@ -48,8 +48,9 @@ public boolean canContain(@NotNull FluidAttribute attribute) {
     }
 
     @Override
-    public void setCanContain(@NotNull FluidAttribute attribute, boolean canContain) {
+    public PropertyFluidFilter setCanContain(@NotNull FluidAttribute attribute, boolean canContain) {
         containmentPredicate.put(attribute, canContain);
+        return this;
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/unification/material/properties/BlastProperty.java b/src/main/java/gregtech/api/unification/material/properties/BlastProperty.java
@@ -81,49 +81,55 @@ public int getBlastTemperature() {
         return blastTemperature;
     }
 
-    public void setBlastTemperature(int blastTemp) {
+    public BlastProperty setBlastTemperature(int blastTemp) {
         if (blastTemp <= 0) throw new IllegalArgumentException("Blast Temperature must be greater than zero!");
         this.blastTemperature = blastTemp;
+        return this;
     }
 
     public GasTier getGasTier() {
         return gasTier;
     }
 
-    public void setGasTier(@NotNull GasTier tier) {
+    public BlastProperty setGasTier(@NotNull GasTier tier) {
         this.gasTier = tier;
+        return this;
     }
 
     public int getDurationOverride() {
         return durationOverride;
     }
 
-    public void setDurationOverride(int duration) {
+    public BlastProperty setDurationOverride(int duration) {
         this.durationOverride = duration;
+        return this;
     }
 
     public int getEUtOverride() {
         return eutOverride;
     }
 
-    public void setEutOverride(int eut) {
+    public BlastProperty setEutOverride(int eut) {
         this.eutOverride = eut;
+        return this;
     }
 
     public int getVacuumDurationOverride() {
         return vacuumDurationOverride;
     }
 
-    public void setVacuumDurationOverride(int duration) {
+    public BlastProperty setVacuumDurationOverride(int duration) {
         this.vacuumDurationOverride = duration;
+        return this;
     }
 
     public int getVacuumEUtOverride() {
         return vacuumEUtOverride;
     }
 
-    public void setVacuumEutOverride(int eut) {
+    public BlastProperty setVacuumEutOverride(int eut) {
         this.vacuumEUtOverride = eut;
+        return this;
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/unification/material/properties/DustProperty.java b/src/main/java/gregtech/api/unification/material/properties/DustProperty.java
@@ -29,18 +29,20 @@ public DustProperty() {
         this(2, 0);
     }
 
-    public void setHarvestLevel(int harvestLevel) {
+    public DustProperty setHarvestLevel(int harvestLevel) {
         if (harvestLevel <= 0) throw new IllegalArgumentException("Harvest Level must be greater than zero!");
         this.harvestLevel = harvestLevel;
+        return this;
     }
 
     public int getHarvestLevel() {
         return this.harvestLevel;
     }
 
-    public void setBurnTime(int burnTime) {
+    public DustProperty setBurnTime(int burnTime) {
         if (burnTime < 0) throw new IllegalArgumentException("Burn Time cannot be negative!");
         this.burnTime = burnTime;
+        return this;
     }
 
     public int getBurnTime() {
diff --git a/src/main/java/gregtech/api/unification/material/properties/ExtraToolProperty.java b/src/main/java/gregtech/api/unification/material/properties/ExtraToolProperty.java
@@ -28,11 +28,11 @@ public OverrideToolProperty() {
         }
 
         // It does not make much sense to set these overrides:
-        public void setShouldIgnoreCraftingTools(boolean ignore) {
+        public OverrideToolProperty setShouldIgnoreCraftingTools(boolean ignore) {
             throw new UnsupportedOperationException();
         }
 
-        public void setUnbreakable(boolean isUnbreakable) {
+        public OverrideToolProperty setUnbreakable(boolean isUnbreakable) {
             throw new UnsupportedOperationException();
         }
 
diff --git a/src/main/java/gregtech/api/unification/material/properties/FluidPipeProperties.java b/src/main/java/gregtech/api/unification/material/properties/FluidPipeProperties.java
@@ -13,7 +13,7 @@
 import java.util.Collection;
 import java.util.Objects;
 
-public class FluidPipeProperties implements IMaterialProperty, IPropertyFluidFilter {
+public class FluidPipeProperties implements IMaterialProperty, IPropertyFluidFilter<FluidPipeProperties> {
 
     private final Object2BooleanMap<FluidAttribute> containmentPredicate = new Object2BooleanOpenHashMap<>();
 
@@ -73,17 +73,19 @@ public int getThroughput() {
         return throughput;
     }
 
-    public void setThroughput(int throughput) {
+    public FluidPipeProperties setThroughput(int throughput) {
         this.throughput = throughput;
+        return this;
     }
 
     @Override
     public int getMaxFluidTemperature() {
         return maxFluidTemperature;
     }
 
-    public void setMaxFluidTemperature(int maxFluidTemperature) {
+    public FluidPipeProperties setMaxFluidTemperature(int maxFluidTemperature) {
         this.maxFluidTemperature = maxFluidTemperature;
+        return this;
     }
 
     @Override
@@ -101,8 +103,9 @@ public boolean canContain(@NotNull FluidAttribute attribute) {
     }
 
     @Override
-    public void setCanContain(@NotNull FluidAttribute attribute, boolean canContain) {
+    public FluidPipeProperties setCanContain(@NotNull FluidAttribute attribute, boolean canContain) {
         this.containmentPredicate.put(attribute, canContain);
+        return this;
     }
 
     @Override
@@ -114,8 +117,9 @@ public boolean isGasProof() {
         return gasProof;
     }
 
-    public void setGasProof(boolean gasProof) {
+    public FluidPipeProperties setGasProof(boolean gasProof) {
         this.gasProof = gasProof;
+        return this;
     }
 
     public boolean isAcidProof() {
@@ -126,16 +130,18 @@ public boolean isCryoProof() {
         return cryoProof;
     }
 
-    public void setCryoProof(boolean cryoProof) {
+    public FluidPipeProperties setCryoProof(boolean cryoProof) {
         this.cryoProof = cryoProof;
+        return this;
     }
 
     public boolean isPlasmaProof() {
         return plasmaProof;
     }
 
-    public void setPlasmaProof(boolean plasmaProof) {
+    public FluidPipeProperties setPlasmaProof(boolean plasmaProof) {
         this.plasmaProof = plasmaProof;
+        return this;
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/unification/material/properties/FluidProperty.java b/src/main/java/gregtech/api/unification/material/properties/FluidProperty.java
@@ -81,8 +81,9 @@ public void store(@NotNull FluidStorageKey key, @NotNull Fluid fluid) {
     /**
      * @param primaryKey the key to use primarily
      */
-    public void setPrimaryKey(@NotNull FluidStorageKey primaryKey) {
+    public FluidProperty setPrimaryKey(@NotNull FluidStorageKey primaryKey) {
         this.primaryKey = primaryKey;
+        return this;
     }
 
     @Override
@@ -116,7 +117,8 @@ public FluidStack solidifiesFrom(int amount) {
      * @param solidifyingFluid The Fluid which solidifies into the material. If left null, it will be left as the
      *                         default value: the material's liquid.
      */
-    public void setSolidifyingFluid(@Nullable Fluid solidifyingFluid) {
+    public FluidProperty setSolidifyingFluid(@Nullable Fluid solidifyingFluid) {
         this.solidifyingFluid = solidifyingFluid;
+        return this;
     }
 }
diff --git a/src/main/java/gregtech/api/unification/material/properties/IngotProperty.java b/src/main/java/gregtech/api/unification/material/properties/IngotProperty.java
@@ -29,33 +29,37 @@ public class IngotProperty implements IMaterialProperty {
     @Nullable
     private Material magneticMaterial;
 
-    public void setSmeltingInto(Material smeltInto) {
+    public IngotProperty setSmeltingInto(Material smeltInto) {
         this.smeltInto = smeltInto;
+        return this;
     }
 
     public Material getSmeltingInto() {
         return this.smeltInto;
     }
 
-    public void setArcSmeltingInto(Material arcSmeltingInto) {
+    public IngotProperty setArcSmeltingInto(Material arcSmeltingInto) {
         this.arcSmeltInto = arcSmeltingInto;
+        return this;
     }
 
     public Material getArcSmeltInto() {
         return this.arcSmeltInto;
     }
 
-    public void setMagneticMaterial(@Nullable Material magneticMaterial) {
+    public IngotProperty setMagneticMaterial(@Nullable Material magneticMaterial) {
         this.magneticMaterial = magneticMaterial;
+        return this;
     }
 
     @Nullable
     public Material getMagneticMaterial() {
         return magneticMaterial;
     }
 
-    public void setMacerateInto(Material macerateInto) {
+    public IngotProperty setMacerateInto(Material macerateInto) {
         this.macerateInto = macerateInto;
+        return this;
     }
 
     public Material getMacerateInto() {
diff --git a/src/main/java/gregtech/api/unification/material/properties/ItemPipeProperties.java b/src/main/java/gregtech/api/unification/material/properties/ItemPipeProperties.java
@@ -38,8 +38,9 @@ public int getPriority() {
     /**
      * Sets the Priority of the item pipe
      */
-    public void setPriority(int priority) {
+    public ItemPipeProperties setPriority(int priority) {
         this.priority = priority;
+        return this;
     }
 
     /**
@@ -56,8 +57,9 @@ public float getTransferRate() {
      *
      * @param transferRate The transfer rate
      */
-    public void setTransferRate(float transferRate) {
+    public ItemPipeProperties setTransferRate(float transferRate) {
         this.transferRate = transferRate;
+        return this;
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/unification/material/properties/OreProperty.java b/src/main/java/gregtech/api/unification/material/properties/OreProperty.java
@@ -105,16 +105,18 @@ public OreProperty() {
         this(1, 1);
     }
 
-    public void setOreMultiplier(int multiplier) {
+    public OreProperty setOreMultiplier(int multiplier) {
         this.oreMultiplier = multiplier;
+        return this;
     }
 
     public int getOreMultiplier() {
         return this.oreMultiplier;
     }
 
-    public void setByProductMultiplier(int multiplier) {
+    public OreProperty setByProductMultiplier(int multiplier) {
         this.byProductMultiplier = multiplier;
+        return this;
     }
 
     public int getByProductMultiplier() {
@@ -125,34 +127,39 @@ public boolean isEmissive() {
         return emissive;
     }
 
-    public void setEmissive(boolean emissive) {
+    public OreProperty setEmissive(boolean emissive) {
         this.emissive = emissive;
+        return this;
     }
 
-    public void setDirectSmeltResult(@Nullable Material m) {
+    public OreProperty setDirectSmeltResult(@Nullable Material m) {
         this.directSmeltResult = m;
+        return this;
     }
 
     @Nullable
     public Material getDirectSmeltResult() {
         return this.directSmeltResult;
     }
 
-    public void setWashedIn(@Nullable Material m) {
+    public OreProperty setWashedIn(@Nullable Material m) {
         this.washedIn = m;
+        return this;
     }
 
-    public void setWashedIn(@Nullable Material m, int washedAmount) {
+    public OreProperty setWashedIn(@Nullable Material m, int washedAmount) {
         this.washedIn = m;
         this.washedAmount = washedAmount;
+        return this;
     }
 
     public Pair<Material, Integer> getWashedIn() {
         return Pair.of(this.washedIn, this.washedAmount);
     }
 
-    public void setSeparatedInto(Material... materials) {
+    public OreProperty setSeparatedInto(Material... materials) {
         this.separatedInto.addAll(Arrays.asList(materials));
+        return this;
     }
 
     @Nullable
@@ -165,27 +172,30 @@ public List<Material> getSeparatedInto() {
      *
      * @param materials the materials to use as byproducts
      */
-    public void setOreByProducts(@NotNull Material... materials) {
+    public OreProperty setOreByProducts(@NotNull Material... materials) {
         setOreByProducts(Arrays.asList(materials));
+        return this;
     }
 
     /**
      * Set the ore byproducts for this property
      *
      * @param materials the materials to use as byproducts
      */
-    public void setOreByProducts(@NotNull Collection<Material> materials) {
+    public OreProperty setOreByProducts(@NotNull Collection<Material> materials) {
         this.oreByProducts.clear();
         this.oreByProducts.addAll(materials);
+        return this;
     }
 
     /**
      * Add ore byproducts to this property
      *
      * @param materials the materials to add as byproducts
      */
-    public void addOreByProducts(@NotNull Material... materials) {
+    public OreProperty addOreByProducts(@NotNull Material... materials) {
         this.oreByProducts.addAll(Arrays.asList(materials));
+        return this;
     }
 
     public List<Material> getOreByProducts() {
diff --git a/src/main/java/gregtech/api/unification/material/properties/RotorProperty.java b/src/main/java/gregtech/api/unification/material/properties/RotorProperty.java
diff --git a/src/main/java/gregtech/api/unification/material/properties/ToolProperty.java b/src/main/java/gregtech/api/unification/material/properties/ToolProperty.java
diff --git a/src/main/java/gregtech/api/unification/material/properties/WireProperties.java b/src/main/java/gregtech/api/unification/material/properties/WireProperties.java

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`import java.util.Collection;`
`14`	`14`
`15`		`-public class PropertyFluidFilter implements IPropertyFluidFilter {`
	`15`	`+public class PropertyFluidFilter implements IPropertyFluidFilter<PropertyFluidFilter> {`
`16`	`16`
`17`	`17`	`private final Object2BooleanMap<FluidAttribute> containmentPredicate = new Object2BooleanOpenHashMap<>();`
`18`	`18`
`@@ -48,8 +48,9 @@ public boolean canContain(@NotNull FluidAttribute attribute) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`51`		`- public void setCanContain(@NotNull FluidAttribute attribute, boolean canContain) {`
	`51`	`+ public PropertyFluidFilter setCanContain(@NotNull FluidAttribute attribute, boolean canContain) {`
`52`	`52`	`containmentPredicate.put(attribute, canContain);`
	`53`	`+ return this;`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -81,49 +81,55 @@ public int getBlastTemperature() {`
`81`	`81`	`return blastTemperature;`
`82`	`82`	`}`
`83`	`83`
`84`		`- public void setBlastTemperature(int blastTemp) {`
	`84`	`+ public BlastProperty setBlastTemperature(int blastTemp) {`
`85`	`85`	`if (blastTemp <= 0) throw new IllegalArgumentException("Blast Temperature must be greater than zero!");`
`86`	`86`	`this.blastTemperature = blastTemp;`
	`87`	`+ return this;`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`public GasTier getGasTier() {`
`90`	`91`	`return gasTier;`
`91`	`92`	`}`
`92`	`93`
`93`		`- public void setGasTier(@NotNull GasTier tier) {`
	`94`	`+ public BlastProperty setGasTier(@NotNull GasTier tier) {`
`94`	`95`	`this.gasTier = tier;`
	`96`	`+ return this;`
`95`	`97`	`}`
`96`	`98`
`97`	`99`	`public int getDurationOverride() {`
`98`	`100`	`return durationOverride;`
`99`	`101`	`}`
`100`	`102`
`101`		`- public void setDurationOverride(int duration) {`
	`103`	`+ public BlastProperty setDurationOverride(int duration) {`
`102`	`104`	`this.durationOverride = duration;`
	`105`	`+ return this;`
`103`	`106`	`}`
`104`	`107`
`105`	`108`	`public int getEUtOverride() {`
`106`	`109`	`return eutOverride;`
`107`	`110`	`}`
`108`	`111`
`109`		`- public void setEutOverride(int eut) {`
	`112`	`+ public BlastProperty setEutOverride(int eut) {`
`110`	`113`	`this.eutOverride = eut;`
	`114`	`+ return this;`
`111`	`115`	`}`
`112`	`116`
`113`	`117`	`public int getVacuumDurationOverride() {`
`114`	`118`	`return vacuumDurationOverride;`
`115`	`119`	`}`
`116`	`120`
`117`		`- public void setVacuumDurationOverride(int duration) {`
	`121`	`+ public BlastProperty setVacuumDurationOverride(int duration) {`
`118`	`122`	`this.vacuumDurationOverride = duration;`
	`123`	`+ return this;`
`119`	`124`	`}`
`120`	`125`
`121`	`126`	`public int getVacuumEUtOverride() {`
`122`	`127`	`return vacuumEUtOverride;`
`123`	`128`	`}`
`124`	`129`
`125`		`- public void setVacuumEutOverride(int eut) {`
	`130`	`+ public BlastProperty setVacuumEutOverride(int eut) {`
`126`	`131`	`this.vacuumEUtOverride = eut;`
	`132`	`+ return this;`
`127`	`133`	`}`
`128`	`134`
`129`	`135`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -29,18 +29,20 @@ public DustProperty() {`
`29`	`29`	`this(2, 0);`
`30`	`30`	`}`
`31`	`31`
`32`		`- public void setHarvestLevel(int harvestLevel) {`
	`32`	`+ public DustProperty setHarvestLevel(int harvestLevel) {`
`33`	`33`	`if (harvestLevel <= 0) throw new IllegalArgumentException("Harvest Level must be greater than zero!");`
`34`	`34`	`this.harvestLevel = harvestLevel;`
	`35`	`+ return this;`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`public int getHarvestLevel() {`
`38`	`39`	`return this.harvestLevel;`
`39`	`40`	`}`
`40`	`41`
`41`		`- public void setBurnTime(int burnTime) {`
	`42`	`+ public DustProperty setBurnTime(int burnTime) {`
`42`	`43`	`if (burnTime < 0) throw new IllegalArgumentException("Burn Time cannot be negative!");`
`43`	`44`	`this.burnTime = burnTime;`
	`45`	`+ return this;`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`public int getBurnTime() {`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,11 @@ public OverrideToolProperty() {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`// It does not make much sense to set these overrides:`
`31`		`- public void setShouldIgnoreCraftingTools(boolean ignore) {`
	`31`	`+ public OverrideToolProperty setShouldIgnoreCraftingTools(boolean ignore) {`
`32`	`32`	`throw new UnsupportedOperationException();`
`33`	`33`	`}`
`34`	`34`
`35`		`- public void setUnbreakable(boolean isUnbreakable) {`
	`35`	`+ public OverrideToolProperty setUnbreakable(boolean isUnbreakable) {`
`36`	`36`	`throw new UnsupportedOperationException();`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`import java.util.Collection;`
`14`	`14`	`import java.util.Objects;`
`15`	`15`
`16`		`-public class FluidPipeProperties implements IMaterialProperty, IPropertyFluidFilter {`
	`16`	`+public class FluidPipeProperties implements IMaterialProperty, IPropertyFluidFilter<FluidPipeProperties> {`
`17`	`17`
`18`	`18`	`private final Object2BooleanMap<FluidAttribute> containmentPredicate = new Object2BooleanOpenHashMap<>();`
`19`	`19`
`@@ -73,17 +73,19 @@ public int getThroughput() {`
`73`	`73`	`return throughput;`
`74`	`74`	`}`
`75`	`75`
`76`		`- public void setThroughput(int throughput) {`
	`76`	`+ public FluidPipeProperties setThroughput(int throughput) {`
`77`	`77`	`this.throughput = throughput;`
	`78`	`+ return this;`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`@Override`
`81`	`82`	`public int getMaxFluidTemperature() {`
`82`	`83`	`return maxFluidTemperature;`
`83`	`84`	`}`
`84`	`85`
`85`		`- public void setMaxFluidTemperature(int maxFluidTemperature) {`
	`86`	`+ public FluidPipeProperties setMaxFluidTemperature(int maxFluidTemperature) {`
`86`	`87`	`this.maxFluidTemperature = maxFluidTemperature;`
	`88`	`+ return this;`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`@Override`
`@@ -101,8 +103,9 @@ public boolean canContain(@NotNull FluidAttribute attribute) {`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`@Override`
`104`		`- public void setCanContain(@NotNull FluidAttribute attribute, boolean canContain) {`
	`106`	`+ public FluidPipeProperties setCanContain(@NotNull FluidAttribute attribute, boolean canContain) {`
`105`	`107`	`this.containmentPredicate.put(attribute, canContain);`
	`108`	`+ return this;`
`106`	`109`	`}`
`107`	`110`
`108`	`111`	`@Override`
`@@ -114,8 +117,9 @@ public boolean isGasProof() {`
`114`	`117`	`return gasProof;`
`115`	`118`	`}`
`116`	`119`
`117`		`- public void setGasProof(boolean gasProof) {`
	`120`	`+ public FluidPipeProperties setGasProof(boolean gasProof) {`
`118`	`121`	`this.gasProof = gasProof;`
	`122`	`+ return this;`
`119`	`123`	`}`
`120`	`124`
`121`	`125`	`public boolean isAcidProof() {`
`@@ -126,16 +130,18 @@ public boolean isCryoProof() {`
`126`	`130`	`return cryoProof;`
`127`	`131`	`}`
`128`	`132`
`129`		`- public void setCryoProof(boolean cryoProof) {`
	`133`	`+ public FluidPipeProperties setCryoProof(boolean cryoProof) {`
`130`	`134`	`this.cryoProof = cryoProof;`
	`135`	`+ return this;`
`131`	`136`	`}`
`132`	`137`
`133`	`138`	`public boolean isPlasmaProof() {`
`134`	`139`	`return plasmaProof;`
`135`	`140`	`}`
`136`	`141`
`137`		`- public void setPlasmaProof(boolean plasmaProof) {`
	`142`	`+ public FluidPipeProperties setPlasmaProof(boolean plasmaProof) {`
`138`	`143`	`this.plasmaProof = plasmaProof;`
	`144`	`+ return this;`
`139`	`145`	`}`
`140`	`146`
`141`	`147`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,9 @@ public void store(@NotNull FluidStorageKey key, @NotNull Fluid fluid) {`
`81`	`81`	`/**`
`82`	`82`	`* @param primaryKey the key to use primarily`
`83`	`83`	`*/`
`84`		`- public void setPrimaryKey(@NotNull FluidStorageKey primaryKey) {`
	`84`	`+ public FluidProperty setPrimaryKey(@NotNull FluidStorageKey primaryKey) {`
`85`	`85`	`this.primaryKey = primaryKey;`
	`86`	`+ return this;`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`@Override`
`@@ -116,7 +117,8 @@ public FluidStack solidifiesFrom(int amount) {`
`116`	`117`	`* @param solidifyingFluid The Fluid which solidifies into the material. If left null, it will be left as the`
`117`	`118`	`* default value: the material's liquid.`
`118`	`119`	`*/`
`119`		`- public void setSolidifyingFluid(@Nullable Fluid solidifyingFluid) {`
	`120`	`+ public FluidProperty setSolidifyingFluid(@Nullable Fluid solidifyingFluid) {`
`120`	`121`	`this.solidifyingFluid = solidifyingFluid;`
	`122`	`+ return this;`
`121`	`123`	`}`
`122`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,33 +29,37 @@ public class IngotProperty implements IMaterialProperty {`
`29`	`29`	`@Nullable`
`30`	`30`	`private Material magneticMaterial;`
`31`	`31`
`32`		`- public void setSmeltingInto(Material smeltInto) {`
	`32`	`+ public IngotProperty setSmeltingInto(Material smeltInto) {`
`33`	`33`	`this.smeltInto = smeltInto;`
	`34`	`+ return this;`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`public Material getSmeltingInto() {`
`37`	`38`	`return this.smeltInto;`
`38`	`39`	`}`
`39`	`40`
`40`		`- public void setArcSmeltingInto(Material arcSmeltingInto) {`
	`41`	`+ public IngotProperty setArcSmeltingInto(Material arcSmeltingInto) {`
`41`	`42`	`this.arcSmeltInto = arcSmeltingInto;`
	`43`	`+ return this;`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`public Material getArcSmeltInto() {`
`45`	`47`	`return this.arcSmeltInto;`
`46`	`48`	`}`
`47`	`49`
`48`		`- public void setMagneticMaterial(@Nullable Material magneticMaterial) {`
	`50`	`+ public IngotProperty setMagneticMaterial(@Nullable Material magneticMaterial) {`
`49`	`51`	`this.magneticMaterial = magneticMaterial;`
	`52`	`+ return this;`
`50`	`53`	`}`
`51`	`54`
`52`	`55`	`@Nullable`
`53`	`56`	`public Material getMagneticMaterial() {`
`54`	`57`	`return magneticMaterial;`
`55`	`58`	`}`
`56`	`59`
`57`		`- public void setMacerateInto(Material macerateInto) {`
	`60`	`+ public IngotProperty setMacerateInto(Material macerateInto) {`
`58`	`61`	`this.macerateInto = macerateInto;`
	`62`	`+ return this;`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	`public Material getMacerateInto() {`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,9 @@ public int getPriority() {`
`38`	`38`	`/**`
`39`	`39`	`* Sets the Priority of the item pipe`
`40`	`40`	`*/`
`41`		`- public void setPriority(int priority) {`
	`41`	`+ public ItemPipeProperties setPriority(int priority) {`
`42`	`42`	`this.priority = priority;`
	`43`	`+ return this;`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`/**`
`@@ -56,8 +57,9 @@ public float getTransferRate() {`
`56`	`57`	`*`
`57`	`58`	`* @param transferRate The transfer rate`
`58`	`59`	`*/`
`59`		`- public void setTransferRate(float transferRate) {`
	`60`	`+ public ItemPipeProperties setTransferRate(float transferRate) {`
`60`	`61`	`this.transferRate = transferRate;`
	`62`	`+ return this;`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -105,16 +105,18 @@ public OreProperty() {`
`105`	`105`	`this(1, 1);`
`106`	`106`	`}`
`107`	`107`
`108`		`- public void setOreMultiplier(int multiplier) {`
	`108`	`+ public OreProperty setOreMultiplier(int multiplier) {`
`109`	`109`	`this.oreMultiplier = multiplier;`
	`110`	`+ return this;`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`public int getOreMultiplier() {`
`113`	`114`	`return this.oreMultiplier;`
`114`	`115`	`}`
`115`	`116`
`116`		`- public void setByProductMultiplier(int multiplier) {`
	`117`	`+ public OreProperty setByProductMultiplier(int multiplier) {`
`117`	`118`	`this.byProductMultiplier = multiplier;`
	`119`	`+ return this;`
`118`	`120`	`}`
`119`	`121`
`120`	`122`	`public int getByProductMultiplier() {`
`@@ -125,34 +127,39 @@ public boolean isEmissive() {`
`125`	`127`	`return emissive;`
`126`	`128`	`}`
`127`	`129`
`128`		`- public void setEmissive(boolean emissive) {`
	`130`	`+ public OreProperty setEmissive(boolean emissive) {`
`129`	`131`	`this.emissive = emissive;`
	`132`	`+ return this;`
`130`	`133`	`}`
`131`	`134`
`132`		`- public void setDirectSmeltResult(@Nullable Material m) {`
	`135`	`+ public OreProperty setDirectSmeltResult(@Nullable Material m) {`
`133`	`136`	`this.directSmeltResult = m;`
	`137`	`+ return this;`
`134`	`138`	`}`
`135`	`139`
`136`	`140`	`@Nullable`
`137`	`141`	`public Material getDirectSmeltResult() {`
`138`	`142`	`return this.directSmeltResult;`
`139`	`143`	`}`
`140`	`144`
`141`		`- public void setWashedIn(@Nullable Material m) {`
	`145`	`+ public OreProperty setWashedIn(@Nullable Material m) {`
`142`	`146`	`this.washedIn = m;`
	`147`	`+ return this;`
`143`	`148`	`}`
`144`	`149`
`145`		`- public void setWashedIn(@Nullable Material m, int washedAmount) {`
	`150`	`+ public OreProperty setWashedIn(@Nullable Material m, int washedAmount) {`
`146`	`151`	`this.washedIn = m;`
`147`	`152`	`this.washedAmount = washedAmount;`
	`153`	`+ return this;`
`148`	`154`	`}`
`149`	`155`
`150`	`156`	`public Pair<Material, Integer> getWashedIn() {`
`151`	`157`	`return Pair.of(this.washedIn, this.washedAmount);`
`152`	`158`	`}`
`153`	`159`
`154`		`- public void setSeparatedInto(Material... materials) {`
	`160`	`+ public OreProperty setSeparatedInto(Material... materials) {`
`155`	`161`	`this.separatedInto.addAll(Arrays.asList(materials));`
	`162`	`+ return this;`
`156`	`163`	`}`
`157`	`164`
`158`	`165`	`@Nullable`
`@@ -165,27 +172,30 @@ public List<Material> getSeparatedInto() {`
`165`	`172`	`*`
`166`	`173`	`* @param materials the materials to use as byproducts`
`167`	`174`	`*/`
`168`		`- public void setOreByProducts(@NotNull Material... materials) {`
	`175`	`+ public OreProperty setOreByProducts(@NotNull Material... materials) {`
`169`	`176`	`setOreByProducts(Arrays.asList(materials));`
	`177`	`+ return this;`
`170`	`178`	`}`
`171`	`179`
`172`	`180`	`/**`
`173`	`181`	`* Set the ore byproducts for this property`
`174`	`182`	`*`
`175`	`183`	`* @param materials the materials to use as byproducts`
`176`	`184`	`*/`
`177`		`- public void setOreByProducts(@NotNull Collection<Material> materials) {`
	`185`	`+ public OreProperty setOreByProducts(@NotNull Collection<Material> materials) {`
`178`	`186`	`this.oreByProducts.clear();`
`179`	`187`	`this.oreByProducts.addAll(materials);`
	`188`	`+ return this;`
`180`	`189`	`}`
`181`	`190`
`182`	`191`	`/**`
`183`	`192`	`* Add ore byproducts to this property`
`184`	`193`	`*`
`185`	`194`	`* @param materials the materials to add as byproducts`
`186`	`195`	`*/`
`187`		`- public void addOreByProducts(@NotNull Material... materials) {`
	`196`	`+ public OreProperty addOreByProducts(@NotNull Material... materials) {`
`188`	`197`	`this.oreByProducts.addAll(Arrays.asList(materials));`
	`198`	`+ return this;`
`189`	`199`	`}`
`190`	`200`
`191`	`201`	`public List<Material> getOreByProducts() {`