fix compatibility with radium

Author: moehreag

build.gradle.kts

@@ -14,7 +14,7 @@ var client = "3.1.10-beta.1"
 var config = "3.1.13"
 var osl = "0.17.2"
 var legacyLwjgl3 = "1.2.11"
-version = "1.1.0"
+version = "1.1.0-beta.2"
 group = "io.github.axolotlclient.oldanimations"
 base.archivesName = "AxolotlClient-OldAnimations"
 

src/main/java/io/github/axolotlclient/oldanimations/mixin/BlockEntityRenderDispatcherMixin.java

@@ -0,0 +1,37 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * For more information, see the LICENSE file.
+ */
+
+package io.github.axolotlclient.oldanimations.mixin;
+
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import io.github.axolotlclient.oldanimations.config.OldAnimationsConfig;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(BlockEntityRenderDispatcher.class)
+public abstract class BlockEntityRenderDispatcherMixin {
+
+	@WrapMethod(method = "render(Lnet/minecraft/block/entity/BlockEntity;FI)V")
+	private void disableBlockEntityMiningProgress(BlockEntity blockEntity, float tickDelta, int blockMiningProgress, Operation<Void> original) {
+		if (blockMiningProgress == -1 || !OldAnimationsConfig.isEnabled() || !OldAnimationsConfig.instance.blockEntityMiningProgress.get()) {
+			original.call(blockEntity, tickDelta, blockMiningProgress);
+		}
+	}
+}

src/main/java/io/github/axolotlclient/oldanimations/mixin/WorldRendererMixin.java

@@ -18,47 +18,20 @@
 
 package io.github.axolotlclient.oldanimations.mixin;
 
-import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import io.github.axolotlclient.oldanimations.config.OldAnimationsConfig;
 import net.minecraft.block.BeaconBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.state.BlockState;
-import net.minecraft.client.render.world.BlockMiningProgress;
 import net.minecraft.client.render.world.WorldRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
 @Mixin(WorldRenderer.class)
 public class WorldRendererMixin {
 
-	@WrapWithCondition(method = "renderEntities", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/world/WorldRenderer;setupMiningProgressState()V"))
-	private boolean axolotlclient$removeMiningProgressGLState(WorldRenderer instance) {
-		/* we should stop setting these GL states */
-		return !OldAnimationsConfig.isEnabled() || !OldAnimationsConfig.instance.blockEntityMiningProgress.get();
-	}
-
-	@WrapOperation(method = "renderEntities", at = @At(value = "INVOKE", target = "Ljava/util/Map;values()Ljava/util/Collection;"))
-	private <V extends BlockMiningProgress> Collection<V> axolotlclient$doNotRenderMiningProgress(Map<Integer, BlockMiningProgress> instance, Operation<Collection<V>> original) {
-		/* goodbye france. hello paris */
-		if (OldAnimationsConfig.isEnabled() && OldAnimationsConfig.instance.blockEntityMiningProgress.get()) {
-			return Collections.emptyList();
-		}
-		return original.call(instance);
-	}
-
-	@WrapWithCondition(method = "renderEntities", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/world/WorldRenderer;restoreMiningProgressState()V"))
-	private boolean axolotlclient$removeMiningProgressGLState2(WorldRenderer instance) {
-		/* we should stop setting these GL states again */
-		return !OldAnimationsConfig.isEnabled() || !OldAnimationsConfig.instance.blockEntityMiningProgress.get();
-	}
-
 	@WrapOperation(method = "renderMiningProgress", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/state/BlockState;getBlock()Lnet/minecraft/block/Block;", ordinal = 0))
 	private Block axolotlclient$skipBlockEntityCheck(BlockState instance, Operation<Block> original) {
 		/* this should remove the blockentity check stopping the mining progress from showing on them. */

src/main/resources/oldanimations.mixins.json

@@ -8,6 +8,7 @@
 	"client": [
 		"AmbientOcclusionFaceMixin",
 		"BeaconRendererMixin",
+		"BlockEntityRenderDispatcherMixin",
 		"BlockMixin",
 		"BlockModelAccessor",
 		"BlockModelRendererMixin",