From 570ad038023fc4615c203dbae336d8763da14350 Mon Sep 17 00:00:00 2001
From: Boblet <hbmmods@gmail.com>
Date: Wed, 18 Jun 2025 16:27:14 +0200
Subject: [PATCH] who's been drawing dyx

---
 changelog                                                | 5 ++++-
 src/main/java/api/hbm/fluidmk2/IFluidUserMK2.java        | 2 +-
 src/main/java/com/hbm/blocks/generic/DungeonSpawner.java | 7 ++++++-
 .../com/hbm/render/tileentity/RendererObjTester.java     | 9 ++++++---
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index fd3dc6df8..c2ba2e7a3 100644
--- a/changelog
+++ b/changelog
@@ -18,6 +18,8 @@
   * I don't know why people wanted this, but here you go
 * The alternate recipe for oxyhydrogen now uses compressed air instead of nothing
 * Improved threaded Mk5, should be a smidge faster now
+* Spires no longer progress phases on peaceful difficulty
+* Spires now have a 20% chance of coming with instructions
 
 ## Fixed
 * Chemical plant ports. For real this time.
@@ -27,4 +29,5 @@
 * Potentially fixed shift clicking issue with the new chemical plant
 * Fixed blowtorch having a minimum gas requirement of 1,000mB despite only using 250mB
 * The gas turbine now uses audio with a 20 tick timeout, fixing a rare issue where the loop gets stuck and never ends
-* Potentially fixed a dupe caused by using InventoryBogoSorter in combination with crates
\ No newline at end of file
+* Potentially fixed a dupe caused by using InventoryBogoSorter in combination with crates
+* Rapidly spinning dyx should no longer have a state leak that would rotate lighting of unrelated TESRs with it
\ No newline at end of file
diff --git a/src/main/java/api/hbm/fluidmk2/IFluidUserMK2.java b/src/main/java/api/hbm/fluidmk2/IFluidUserMK2.java
index 755c415c5..1e60f7585 100644
--- a/src/main/java/api/hbm/fluidmk2/IFluidUserMK2.java
+++ b/src/main/java/api/hbm/fluidmk2/IFluidUserMK2.java
@@ -9,7 +9,7 @@ public interface IFluidUserMK2 extends IFluidConnectorMK2, ILoadedTile {
 	public static final int HIGHEST_VALID_PRESSURE = 5;
 	public static final int[] DEFAULT_PRESSURE_RANGE = new int[] {0, 0};
 	
-	public static final boolean particleDebug = true;
+	public static final boolean particleDebug = false;
 	
 	public FluidTank[] getAllTanks();
 }
diff --git a/src/main/java/com/hbm/blocks/generic/DungeonSpawner.java b/src/main/java/com/hbm/blocks/generic/DungeonSpawner.java
index 65f4ef5e5..4a6fc10d8 100644
--- a/src/main/java/com/hbm/blocks/generic/DungeonSpawner.java
+++ b/src/main/java/com/hbm/blocks/generic/DungeonSpawner.java
@@ -81,6 +81,7 @@ public class DungeonSpawner extends BlockContainer {
 	
 	public static Function<TileEntityDungeonSpawner, Boolean> CON_ABERRATOR = (tile) -> {
 		World world = tile.getWorldObj();
+		if(world.difficultySetting.ordinal() == 0) return false;
 		int x = tile.xCoord;
 		int y = tile.yCoord;
 		int z = tile.zCoord;
@@ -122,7 +123,11 @@ public class DungeonSpawner extends BlockContainer {
 			TileEntity te = world.getTileEntity(x, y + 18, z);
 			if(te instanceof TileEntitySkeletonHolder) {
 				TileEntitySkeletonHolder skeleton = (TileEntitySkeletonHolder) te;
-				skeleton.item = new ItemStack(ModItems.item_secret, 1, EnumSecretType.ABERRATOR.ordinal());
+				if(world.rand.nextInt(5) == 0) {
+					skeleton.item = new ItemStack(ModItems.item_secret, 1, EnumSecretType.ABERRATOR.ordinal());
+				} else {
+					skeleton.item = new ItemStack(ModItems.clay_tablet, 1, 1);
+				}
 				skeleton.markDirty();
 				world.markBlockForUpdate(x, y + 18, z);
 			}
diff --git a/src/main/java/com/hbm/render/tileentity/RendererObjTester.java b/src/main/java/com/hbm/render/tileentity/RendererObjTester.java
index 8762c01c0..450fcd6cb 100644
--- a/src/main/java/com/hbm/render/tileentity/RendererObjTester.java
+++ b/src/main/java/com/hbm/render/tileentity/RendererObjTester.java
@@ -35,11 +35,8 @@ public class RendererObjTester extends TileEntitySpecialRenderer {
 	public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) {
 		GL11.glPushMatrix();
 		GL11.glTranslated(x + 0.5, y + 1, z + 0.5);
-		GL11.glRotated(15, 0, 0, 1);
 		GL11.glDisable(GL11.GL_CULL_FACE);
 		
-		GL11.glRotated(System.currentTimeMillis() / 5D % 360D, 0, -1, 0);
-		
 		if(world == null) {
 			world = new WorldInAJar(5, 3, 5);
 			for(int i = 0; i < 25; i++) world.setBlock(i / 5, 1, i % 5, Blocks.brick_block, 0);
@@ -55,6 +52,8 @@ public class RendererObjTester extends TileEntitySpecialRenderer {
 		RenderHelper.disableStandardItemLighting();
 		
 		GL11.glPushMatrix();
+		GL11.glRotated(15, 0, 0, 1);
+		GL11.glRotated(System.currentTimeMillis() / 5D % 360D, 0, -1, 0);
 		GL11.glTranslated(-2.5, 0, -2.5);
 		Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
@@ -73,6 +72,10 @@ public class RendererObjTester extends TileEntitySpecialRenderer {
 		GL11.glPopMatrix();
 
 		RenderHelper.enableStandardItemLighting();
+
+		GL11.glRotated(15, 0, 0, 1);
+		GL11.glRotated(System.currentTimeMillis() / 5D % 360D, 0, -1, 0);
+		
 		GL11.glTranslated(0, 2.1, 0.5);
 		
 		this.bindTexture(extra);