Improved mod compatibility when sleeping in Atum

TeamMetallurgy · Jul 12, 2020 · af6443d · af6443d
1 parent f692d95
commit af6443d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -30,6 +30,7 @@ repositories {
     name = "TheOneProbe"
     url = "https://maven.tterrag.com"
   }
+  flatDir { dirs 'deps' }
 }
 
 version = "${minecraft_version}-${mod_version}" + getBuildNumber()
@@ -76,6 +77,7 @@ dependencies {
     compile fg.deobf("mcp.mobius.waila:Hwyla:${hwyla_version}_${minecraft_version}")
     compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-${minecraft_version}:${ct_version}")
     compile "mcjty.theoneprobe:TheOneProbe-1.15:${top_version}:api"
+	runtimeOnly fg.deobf("flatdir:champions:1.15.2-2.0-beta4")
 }
 
 

diff --git a/deps/champions-1.15.2-2.0-beta4.jar b/deps/champions-1.15.2-2.0-beta4.jar
diff --git a/libs/champions-1.12.2-1.0.11.3.jar b/libs/champions-1.12.2-1.0.11.3.jar
diff --git a/src/main/java/com/teammetallurgy/atum/integration/champion/ChampionsHelper.java b/src/main/java/com/teammetallurgy/atum/integration/champion/ChampionsHelper.java
@@ -2,7 +2,6 @@
 
 import com.teammetallurgy.atum.Atum;
 import com.teammetallurgy.atum.integration.IModIntegration;
-import com.teammetallurgy.atum.integration.IntegrationHandler;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.MissingTextureSprite;
 import net.minecraft.client.renderer.texture.SimpleTexture;
@@ -19,14 +18,14 @@ public class ChampionsHelper implements IModIntegration {
 
     @OnlyIn(Dist.CLIENT)
     public static boolean isChampion(Entity entity) {
-        if (IntegrationHandler.getConfigValue(CHAMPION_ID)) {
+        /*if (IntegrationHandler.getConfigValue(CHAMPION_ID)) {
             CompoundNBT compound = new CompoundNBT();
-            entity.deserializeNBT(compound);
+            entity.deserializeNBT(compound); //TODO, breaks entities currently
             if (compound.contains("ForgeCaps")) {
                 CompoundNBT forgeCaps = compound.getCompound("ForgeCaps");
-                return forgeCaps.contains("champions:championship");
+                return forgeCaps.contains("champions:champion");
             }
-        }
+        }*/
         return false;
     }
 

diff --git a/src/main/java/com/teammetallurgy/atum/world/dimension/AtumDimension.java b/src/main/java/com/teammetallurgy/atum/world/dimension/AtumDimension.java
@@ -23,6 +23,7 @@
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.provider.BiomeProviderType;
@@ -37,6 +38,7 @@
 import net.minecraft.world.server.ServerWorld;
 import net.minecraft.world.storage.DerivedWorldInfo;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import net.minecraftforge.event.world.SleepFinishedTimeEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
@@ -75,12 +77,14 @@ public boolean doesWaterVaporize() {
         }
     }
 
-    @Override
-    public void setWorldTime(long time) {
-        if (time == 24000L && this.world.getWorldInfo() instanceof DerivedWorldInfo) {
-            ((DerivedWorldInfo) this.world.getWorldInfo()).delegate.setDayTime(time); //Workaround for making sleeping work in Atum
+    @SubscribeEvent
+    public static void onSleepFinished(SleepFinishedTimeEvent event) {
+        IWorld world = event.getWorld();
+        if (world.getDimension() instanceof AtumDimension) {
+            if (world.getWorldInfo() instanceof DerivedWorldInfo) {
+                ((DerivedWorldInfo) world.getWorldInfo()).delegate.setDayTime(event.getNewTime()); //Workaround for making sleeping work in Atum
+            }
         }
-        super.setWorldTime(time);
     }
 
     @Override