Merge branch 'mui2-refactor' of https://github.com/GregTechCEu/GregTech-Modern into fork/zetrock1/mui2-coke-oven-machine

Author: YoungOnionMC

.github/workflows/manage-pr-labels.yml

@@ -30,7 +30,7 @@ jobs:
         with:
           mode: minimum
           count: 1
-          labels: 'type: feature, type: bugfix, type: refactor, type: translation, ignore changelog'
+          labels: 'type: feature, type: bugfix, type: refactor, type: translation, type: tests, ignore changelog'
           exit_type: failure
 
       - name: Check for Required Release Label # require exactly one of these labels

CHANGELOG.md

@@ -1,5 +1,57 @@
 # ChangeLog
 
+## Version [v7.4.1](https://github.com/GregTechCEu/GregTech-Modern/compare/v7.4.0-1.20.1...v7.4.1-1.20.1)
+### Added
+
+- Improvements to Sodalite and Lazurite by @htmlcsjs in [#4297](https://github.com/GregTechCEu/GregTech-Modern/pull/4297)
+- Allow accessing block nbt from placeholders by @TarLaboratories in [#4161](https://github.com/GregTechCEu/GregTech-Modern/pull/4161)
+- Fix blackstone and tuff ores not dropping dusts by @JuiceyBeans in [#4376](https://github.com/GregTechCEu/GregTech-Modern/pull/4376)
+- Make netherite tools and items fire resistant by @JuiceyBeans in [#4378](https://github.com/GregTechCEu/GregTech-Modern/pull/4378)
+-  Jade support for Long Distance Pipeline Endpoints by @JuiceyBeans in [#4420](https://github.com/GregTechCEu/GregTech-Modern/pull/4420)
+
+### Fixed
+
+- Fix vanilla fuel not working in boilers by @jurrejelle in [#4249](https://github.com/GregTechCEu/GregTech-Modern/pull/4249)
+- Fix manual mode for item/fluid filter covers and conveyors/pumps by @programmer3481 in [#4245](https://github.com/GregTechCEu/GregTech-Modern/pull/4245)
+- no more z fighting by @Spicierspace153 in [#4240](https://github.com/GregTechCEu/GregTech-Modern/pull/4240)
+- Fix #4154 Charcoal Pile Igniter by @zetrock1 in [#4246](https://github.com/GregTechCEu/GregTech-Modern/pull/4246)
+- Add tooltips for link covers by @zetrock1 in [#4265](https://github.com/GregTechCEu/GregTech-Modern/pull/4265)
+- Large Boiler throttle modifies burn time of current fuel by @DilithiumThoride in [#4258](https://github.com/GregTechCEu/GregTech-Modern/pull/4258)
+- Fix scythe not breaking items in an AOE by @Ujhik in [#4207](https://github.com/GregTechCEu/GregTech-Modern/pull/4207)
+- Fix GT Capes not rendering in multiplayer by @DilithiumThoride in [#4271](https://github.com/GregTechCEu/GregTech-Modern/pull/4271)
+- Fix dupes of Carbon dust and Coal dust by @zetrock1 in [#4301](https://github.com/GregTechCEu/GregTech-Modern/pull/4301)
+- rework the check for decomposition amounts by @jonasGajdosikas in [#4298](https://github.com/GregTechCEu/GregTech-Modern/pull/4298)
+- Fix ghost circuit in item detector by @zetrock1 in [#4293](https://github.com/GregTechCEu/GregTech-Modern/pull/4293)
+- Fixes shiny material set double plates. by @Flare32 in [#4213](https://github.com/GregTechCEu/GregTech-Modern/pull/4213)
+- Add directional setting UI and fix Machine UI TitleBar by @remakefactory in [#4238](https://github.com/GregTechCEu/GregTech-Modern/pull/4238)
+- KubeJS Duration Check by @YoungOnionMC in [#4327](https://github.com/GregTechCEu/GregTech-Modern/pull/4327)
+- Fixes some cases where handleRecipe() succeeds when it should fail by @DilithiumThoride in [#4300](https://github.com/GregTechCEu/GregTech-Modern/pull/4300)
+- Allow tags in shaped recipes to get recycle info by @jurrejelle in [#4292](https://github.com/GregTechCEu/GregTech-Modern/pull/4292)
+- Prevent clientside state mutations in QuarkTechSuite helmet by @Mqrius in [#4322](https://github.com/GregTechCEu/GregTech-Modern/pull/4322)
+- (Docs) Fix GTValues.VA being used as a function in material property modification, add reference to coil temps in Material Properties by @carbonatek in [#4338](https://github.com/GregTechCEu/GregTech-Modern/pull/4338)
+- Update spotless to 8.1.0 by @Reabstraction in [#4323](https://github.com/GregTechCEu/GregTech-Modern/pull/4323)
+- PumpBiomeModifier - change priority of tags by @zetrock1 in [#4369](https://github.com/GregTechCEu/GregTech-Modern/pull/4369)
+- Make fuel jetpacks work on servers by @Mqrius in [#4341](https://github.com/GregTechCEu/GregTech-Modern/pull/4341)
+- Fix facade cover json by @jurrejelle in [#4418](https://github.com/GregTechCEu/GregTech-Modern/pull/4418)
+-  Correct Data Stick interaction handling by @remakefactory in [#4409](https://github.com/GregTechCEu/GregTech-Modern/pull/4409)
+- Fixes to overlay textures on some machines. by @Conity723 in [#4403](https://github.com/GregTechCEu/GregTech-Modern/pull/4403)
+- Fix {fromAscii} placeholder by @TarLaboratories in [#4392](https://github.com/GregTechCEu/GregTech-Modern/pull/4392)
+- Fix rotor holder Z-fighting by @zetrock1 in [#4335](https://github.com/GregTechCEu/GregTech-Modern/pull/4335)
+- Refactor naquadah reactor overlays to a workableMultiblockMachineCasing compatible format by @jonasGajdosikas in [#4353](https://github.com/GregTechCEu/GregTech-Modern/pull/4353)
+- Fix ranged output items voiding if there wasn't enough output space by @DilithiumThoride in [#4290](https://github.com/GregTechCEu/GregTech-Modern/pull/4290)
+- Add recipe for Copper Ingot disassembling by @esmenard in [#4399](https://github.com/GregTechCEu/GregTech-Modern/pull/4399)
+- Fix multiblock controller rotation overlay logic by @jkieberking in [#4199](https://github.com/GregTechCEu/GregTech-Modern/pull/4199)
+- Add missing rock types to initializeCobbleReplacements() by @Pyritie in [#4329](https://github.com/GregTechCEu/GregTech-Modern/pull/4329)
+
+### Changed
+
+- Large Boiler throttle modifies burn time of current fuel by @DilithiumThoride in [#4258](https://github.com/GregTechCEu/GregTech-Modern/pull/4258)
+- ja_jp fix by @code-onigiri in [#4319](https://github.com/GregTechCEu/GregTech-Modern/pull/4319)
+- Change out LDLib client side check to GTCEu one by @jurrejelle in [#4365](https://github.com/GregTechCEu/GregTech-Modern/pull/4365)
+- Update uk_ua.json by @StarmanMine142 in [#4411](https://github.com/GregTechCEu/GregTech-Modern/pull/4411)
+- Port existing keybinds to new system by @TechLord22 in [#4069](https://github.com/GregTechCEu/GregTech-Modern/pull/4069)
+
+ 
 ## Version [v7.4.0](https://github.com/GregTechCEu/GregTech-Modern/compare/v7.3.0-1.20.1...v7.4.0-1.20.1)
 ### Added
 

dependencies.gradle

@@ -26,8 +26,7 @@ dependencies {
     modCompileOnly(forge.bundles.rei)
     modCompileOnly(forge.emi)
 
-    // WAILA-likes
-    modCompileOnly(forge.theoneprobe)
+    // Jade (WAILA)
     modCompileOnly(forge.jade)
 
     // Curios

docs/content/Development/Data-Sync-System/Annotations.md

@@ -58,32 +58,4 @@ public boolean isWorkingEnabled = true;
 public void isWorkingChanged() {
     setRenderState(getRenderState().setValue(GTMachineModelProperties.IS_WORKING_ENABLED, isWorkingEnabled));
 }
-```
-
-### `@FieldDataModifier` and `@CustomDataField`
-
-
-
-The `@FieldDataModifier`annotation defines custom processing to be performed on the NBT for a field, e.g. for compatibility reasons.
-
-The `@CustomDataField`annotation defines a field with a type too complex to be serialised using the normal system. Custom data fields must have exactly one load modifier and one data modifier.
-
-Field data modifiers on non-custom fields will be applied *after* standard serialisation/deserialisation, and will be called with an argument containing the current tag.
-
-```java
-@CustomDataField
-@SaveField
-public VeryComplexType myVeryComplexValue = new VeryComplexType();
-
-@FieldDataModifier(fieldName="myVeryComplexValue", target=FieldDataModifier.MODIFY_TARGET.LOAD_NBT)
-public void loadVeryComplexValue(CompoundTag tag) {
-    // Process tag here.
-    myVeryComplexValue = new VeryComplexType();
-}
-
-@FieldDataModifier(fieldName="myVeryComplexValue", target=FieldDataModifier.MODIFY_TARGET.SAVE_NBT)
-public CompoundTag saveVeryComplexValue(CompoundTag tag, boolean isSendingToClient) {
-    // Save data here.
-    return tag;
-}
 ```

docs/content/Development/Data-Sync-System/Migrating-From-LDLib-SyncData.md

@@ -24,4 +24,4 @@ Client sync fields **do not** automatically detect changes. When changing a clie
 
 ### Other changes
 
- - `saveCustomPersistedData` & `loadCustomPersistedData` methods: Use `@CustomDataModifier` & `@FieldDataModifier`
+ - `saveCustomPersistedData` & `loadCustomPersistedData` methods, and serialization of custom data types - See `ValueTransformer<T>` and `ValueTransformers` classes.

docs/content/Development/Data-Sync-System/Usage.md

@@ -58,41 +58,46 @@ The following field types are supported by default:
 
 ### Adding support for additional types
 
-To add support for an additional type, call `ValueTransformers.registerClassTransformer(Class<?> cls, IValueTransformer<?> transformer)` or `ValueTransformers.registerInterfaceTransformer(Class<?> cls, IValueTransformer<?> transformer)`
+The `ValueTransformer<T>` abstract class defines how a value of type `T` should be serialized.
 
-The `IValueTransformer<T>` interface defines how a value of type `T` should be serialised.
+To add support for an additional type, call `ValueTransformers.registerTransformer(Class<T> cls, ValueTransformer<T> transformer)` or `ValueTransformers.registerTransformerSupplier(Class<T> cls, Supplier<ValueTransformer<T>> func)`
 
+Additionally, fields can be explicitly directed to use a specific value transformer:
 ```java
-public interface IValueTransformer<T> {
-
-    // If this type cannot be instanced purely from a serialised tag.
-    // All complex type typically have mustProvideObject true 
-    default boolean mustProvideObject() {
-        return false;
-    }
-    
-    // A method for serialising a value into a tag
-    // Called when serialising a value to be sent to the client
-    default Tag serializeClientSyncNBT(@Nullable T value, ISyncManaged holder) {
-      return serializeNBT(value, holder);
+/**
+ * Example from HullMachine.java. This example shows serialization of an AE2 class which may or may not be loaded at runtime.
+ */
+
+@SaveField(nbtKey = "grid_node")
+private final Object gridNodeHost;
+
+private static class GridNodeHostTransformer implements ValueTransformer<Object> {
+
+  @Override
+  public Tag serializeNBT(Object value, TransformerContext<Object> context) {
+    if (GTCEu.Mods.isAE2Loaded() &&
+            (context.currentValue()) instanceof IGridConnectedBlockEntity connectedBlockEntity) {
+      var compound = new CompoundTag();
+      connectedBlockEntity.getMainNode().saveToNBT(compound);
+      return compound;
     }
-
-    // A method for deserialising a value from a tag
-    // Called when deserialising a value on the client.
-    // If mustProvideObject == true, currentVal is the currently saved value.
-  default T deserializeClientNBT(Tag tag, ISyncManaged holder, @Nullable T currentVal) {
-      return deserializeNBT(tag, holder, currentVal);
+    return new CompoundTag();
+  }
+
+  @Override
+  public @Nullable Object deserializeNBT(Tag tag, TransformerContext<Object> context) {
+    if (GTCEu.Mods.isAE2Loaded() &&
+            context.currentValue() instanceof IGridConnectedBlockEntity connectedBlockEntity &&
+            tag instanceof CompoundTag c) {
+      connectedBlockEntity.getMainNode().loadFromNBT(c);
     }
+    return null;
+  }
+}
 
-
-  // A method for serialising a value into a tag.
-  // The holder param is the object this sync value is attached to
-  Tag serializeNBT(T value, ISyncManaged holder);
-    
-  // A method for deserialising a value from a tag
-  // If mustProvideObject == true, currentVal is the currently saved value.
-  T deserializeNBT(Tag tag, ISyncManaged holder, @Nullable T currentVal);
+static {
+  ClassSyncData.getClassData(HullMachine.class).setCustomTransformerForField("gridNodeHost",
+          new GridNodeHostTransformer());
 }
-```
 
-Some types may be too complex to be processed using this system. For more complex NBT interactions, use the `@FieldDataModifier` and `@CustomDataField` annotations.
+```