Merge remote-tracking branch 'origin/master-1.20-lts' into master-1.21-lts

Author: rubensworks

CHANGELOG-1.20.1.md

@@ -1,8 +1,15 @@
 # Changelog for Minecraft 1.20.1
 All notable changes to this project will be documented in this file.
 
+<a name="1.20.1-1.30.3"></a>
+## [1.20.1-1.30.3](/compare/1.20.1-1.30.2...1.20.1-1.30.3) - 2026-04-11 19:53:57
+
+
+### Changed
+* Give Delayer its own energy consumption config separate from Proxy (#1641), Closes #1640
+
 <a name="1.20.1-1.30.2"></a>
-## [1.20.1-1.30.2](/compare/1.20.1-1.30.1...1.20.1-1.30.2) - 2026-03-28 09:55:51
+## [1.20.1-1.30.2](/compare/1.20.1-1.30.1...1.20.1-1.30.2) - 2026-03-28 09:55:51 +0100
 
 
 ### Added

resources/changelog/1.20.1-1.30.3.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.20.0 or higher.
+
+Changes:
+* Give Delayer its own energy consumption config separate from Proxy (#1641), Closes #1640

src/main/java/org/cyclops/integrateddynamics/GeneralConfig.java

@@ -77,6 +77,8 @@ public class GeneralConfig extends DummyConfig {
     public static int panelLightDynamicBaseConsumption = 0;
     @ConfigurableProperty(category = "general", comment = "The base energy usage for the static light panel.", minimalValue = 0, configLocation = ModConfig.Type.SERVER)
     public static int panelLightStaticBaseConsumption = 0;
+    @ConfigurableProperty(category = "general", comment = "The base energy usage for the delayer.", minimalValue = 0, configLocation = ModConfig.Type.SERVER)
+    public static int delayerBaseConsumption = 2;
     @ConfigurableProperty(category = "general", comment = "The base energy usage for the proxy.", minimalValue = 0, configLocation = ModConfig.Type.SERVER)
     public static int proxyBaseConsumption = 2;
     @ConfigurableProperty(category = "general", comment = "The base energy usage for the redstone reader.", minimalValue = 0, configLocation = ModConfig.Type.SERVER)

src/main/java/org/cyclops/integrateddynamics/network/DelayNetworkElement.java

@@ -2,6 +2,7 @@
 
 import net.minecraft.resources.ResourceLocation;
 import org.cyclops.cyclopscore.datastructure.DimPos;
+import org.cyclops.integrateddynamics.GeneralConfig;
 import org.cyclops.integrateddynamics.Reference;
 
 /**
@@ -21,4 +22,9 @@ public ResourceLocation getGroup() {
         return DelayNetworkElement.GROUP;
     }
 
+    @Override
+    public int getConsumptionRate() {
+        return GeneralConfig.delayerBaseConsumption;
+    }
+
 }