more more more

VazkiiMods · Feb 16, 2024 · cb4b800 · cb4b800
1 parent cd9424b
commit cb4b800
Showing 1 changed file with 10 additions and 15 deletions.
diff --git a/src/main/java/org/violetmoon/zeta/util/handler/ToolInteractionHandler.java b/src/main/java/org/violetmoon/zeta/util/handler/ToolInteractionHandler.java
@@ -45,13 +45,13 @@ public static void registerWaxedBlock(ZetaModule module, Block clean, Block waxe
 		waxingByModule.put(module, Pair.of(clean, waxed));
 	}
 
-	public static void registerWaxedBlockBooleanProperty(ZetaModule module, Block clean, Block waxed, BooleanProperty property) {
+	public static void registerWaxedBlockBooleanProperty(ZetaModule module, Block block, BooleanProperty property) {
 		BooleanPropertyWaxableBlock booleanPropertyWaxableBlock =
-				new BooleanPropertyWaxableBlock(module, clean, waxed, property, ToolActions.AXE_WAX_OFF);
+				new BooleanPropertyWaxableBlock(module, block, property, ToolActions.AXE_WAX_OFF);
 
 		booleanPropertySet.add(booleanPropertyWaxableBlock);
 
-		waxingByModule.put(module, Pair.of(clean, waxed));
+		waxingByModule.put(module, Pair.of(block, block));
 	}
 
 	public static void registerInteraction(ToolAction action, Block in, Block out) {
@@ -101,9 +101,8 @@ public static void toolActionEvent(ZBlock.BlockToolModification event) {
 				BlockState state = event.getState();
 				Block block = state.getBlock();
 
-				if(waxableBlock.clean == block) {
-					Block finalBlock = waxableBlock.waxed;
-					event.setFinalState(copyState(state, finalBlock)
+				if(waxableBlock.block == block) {
+					event.setFinalState(copyState(state, waxableBlock.block)
 							.setValue(waxableBlock.property, false)
 					);
 				}
@@ -139,14 +138,12 @@ public static void itemUse(ZRightClickBlock event) {
 			}
 
 			for (BooleanPropertyWaxableBlock waxableBlock : booleanPropertySet) {
-				if(waxableBlock.clean == block) {
-					Block alternate = waxableBlock.waxed;
-
+				if(waxableBlock.block == block) {
 					if(event.getEntity() instanceof ServerPlayer sp)
 						CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger(sp, pos, stack);
 
 					if(!world.isClientSide)
-						world.setBlockAndUpdate(pos, copyState(state, alternate)
+						world.setBlockAndUpdate(pos, copyState(state, waxableBlock.block)
 								.setValue(waxableBlock.property, true)
 						);
 					world.levelEvent(event.getPlayer(), LevelEvent.PARTICLES_AND_SOUND_WAX_ON, pos, 0);
@@ -174,15 +171,13 @@ private static BlockState copyState(BlockState original, Block newBlock) {
 
 	public static class BooleanPropertyWaxableBlock {
 		public ZetaModule module;
-		public Block clean;
-		public Block waxed;
+		public Block block;
 		public BooleanProperty property;
 		public ToolAction action;
 
-		private BooleanPropertyWaxableBlock(ZetaModule module, Block clean, Block waxed, BooleanProperty property, ToolAction action) {
+		private BooleanPropertyWaxableBlock(ZetaModule module, Block block, BooleanProperty property, ToolAction action) {
 			this.module = module;
-			this.clean = clean;
-			this.waxed = waxed;
+			this.block = block;
 			this.property = property;
 			this.action = action;
 		}