Merge pull request #595 from SymmetricDevs/bru-bdsm-cme

fix: CME in BDS&M

Author: bruberu

dependencies.gradle

@@ -20,8 +20,6 @@
  * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
  */
 dependencies {
-    implementation 'org.reflections:reflections:0.10.2'
-
     // # Fix crashes on macOS with Narrator
     runtimeOnly 'com.cleanroommc:osxnarratorblocker:1.0'
 

src/main/java/supersymmetry/Supersymmetry.java

@@ -9,7 +9,6 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import org.jetbrains.annotations.NotNull;
-import org.reflections.Reflections;
 
 import gregtech.GTInternalTags;
 import supersymmetry.api.capability.SuSyCapabilities;
@@ -48,8 +47,6 @@ public class Supersymmetry {
     @Mod.Instance(Supersymmetry.MODID)
     public static Supersymmetry instance;
 
-    public static Reflections reflectionHandler;
-
     @Mod.EventHandler
     public void onModConstruction(FMLConstructionEvent event) {
         // This is now a config option I think
@@ -65,8 +62,6 @@ public void onModConstruction(FMLConstructionEvent event) {
     public void onPreInit(@NotNull FMLPreInitializationEvent event) {
         proxy.preLoad();
 
-        reflectionHandler = new Reflections("supersymmetry");
-
         SuSyMetaBlocks.init();
         SuSyMetaItems.initMetaItems();
         SuSyBlocks.init();

src/main/java/supersymmetry/api/rocketry/fuels/RocketFuelEntry.java

@@ -12,38 +12,43 @@ public class RocketFuelEntry {
 
     public static class RocketFuelEntryBuilder {
 
-        private RocketFuelEntry rfe;
+        private String registryName;
+        private ArrayList<Tuple<Material, Integer>> composition;
+        private double density;
+        private double sIVacuum;
+        private double sIPerPressure;
 
         public RocketFuelEntryBuilder(String name) {
-            this.rfe.registryName = name;
-            this.rfe.composition = new ArrayList<>();
+            this.registryName = name;
+            this.composition = new ArrayList<>();
         }
 
         public RocketFuelEntryBuilder addComponent(Material mat, int proportion) {
-            rfe.composition.add(new Tuple<Material, Integer>(mat, proportion));
+            composition.add(new Tuple<>(mat, proportion));
             return this;
         }
 
         public RocketFuelEntryBuilder density(double density) {
-            rfe.density = density;
+            this.density = density;
             return this;
         }
 
         public RocketFuelEntryBuilder sIVacuum(double sIVacuum) {
-            rfe.sIVacuum = sIVacuum;
+            this.sIVacuum = sIVacuum;
             return this;
         }
 
         public RocketFuelEntryBuilder sIPerPressure(double sIPerPressure) {
-            rfe.sIPerPressure = sIPerPressure;
+            this.sIPerPressure = sIPerPressure;
             return this;
         }
 
         public void register() {
-            if (rfe.composition.isEmpty()) {
+            if (this.composition.isEmpty()) {
                 throw new IllegalStateException("empty list of fuel component entries");
             }
-            RocketFuelEntry.registerFuel(rfe);
+            RocketFuelEntry.registerFuel(new RocketFuelEntry(this.registryName, this.composition, this.density,
+                    this.sIVacuum, this.sIPerPressure));
         }
     }
 

src/main/java/supersymmetry/common/materials/SuSyHighDegreeMaterials.java

@@ -11,7 +11,8 @@ public class SuSyHighDegreeMaterials {
 
     public static void init() {
         // The gold content is much less than this
-        MetallizedBoPET = new Material.Builder(15289, SuSyUtility.susyId("metallized_bopet"))
+        // Placed at the end of ThirdDegreeMaterials.groovy
+        MetallizedBoPET = new Material.Builder(24999, SuSyUtility.susyId("metallized_bopet"))
                 .polymer()
                 .flags(GENERATE_FOIL)
                 .components(Carbon, 10, Hydrogen, 6, Oxygen, 4, Gold, 1)

src/main/java/supersymmetry/mixins/bdsandm/ServerHandlerMixin.java

@@ -0,0 +1,42 @@
+package supersymmetry.mixins.bdsandm;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.IThreadListener;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+
+import funwayguy.bdsandm.blocks.IStorageBlock;
+import funwayguy.bdsandm.network.PacketBdsm;
+
+// I will PR this to UniversalTweaks as well.
+@Mixin(value = PacketBdsm.ServerHandler.class, remap = false, priority = Integer.MAX_VALUE)
+public class ServerHandlerMixin {
+
+    @WrapOperation(method = "onMessage(Lfunwayguy/bdsandm/network/PacketBdsm;Lnet/minecraftforge/fml/common/network/simpleimpl/MessageContext;)Lfunwayguy/bdsandm/network/PacketBdsm;",
+                   at = @At(target = "Lfunwayguy/bdsandm/blocks/IStorageBlock;onPlayerInteract(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/util/EnumFacing;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/util/EnumHand;ZZI)V",
+                            value = "INVOKE"))
+    public void threadSafeInteract(IStorageBlock instance, World world, BlockPos blockPos, IBlockState iBlockState,
+                                   EnumFacing enumFacing, EntityPlayerMP entityPlayerMP, EnumHand enumHand,
+                                   boolean isHit, boolean altMode, int delay, Operation<Void> original,
+                                   PacketBdsm message, MessageContext ctx) {
+        IThreadListener threadListener = FMLCommonHandler.instance().getWorldThread(ctx.netHandler);
+        if (threadListener.isCallingFromMinecraftThread()) {
+            original.call(instance, world, blockPos, iBlockState, enumFacing, entityPlayerMP, enumHand, isHit, altMode,
+                    delay);
+        } else {
+            threadListener.addScheduledTask(() -> original.call(instance, world, blockPos, iBlockState, enumFacing,
+                    entityPlayerMP, enumHand, isHit, altMode, delay));
+        }
+    }
+}

src/main/resources/mixins.susy.bdsandm.json

@@ -6,6 +6,7 @@
   "compatibilityLevel" : "JAVA_8",
   "mixins" : [
     "BlockBarrelBaseMixin",
-    "ItemBarrelMixin"
+    "ItemBarrelMixin",
+    "ServerHandlerMixin"
   ]
 }