[WIP] 1.14.4 port

src/main/java/mods/betterfoliage/MixinConnector.java

@@ -0,0 +1,20 @@
+package mods.betterfoliage;
+
+import net.minecraftforge.fml.ModLoader;
+import org.spongepowered.asm.mixin.Mixins;
+import org.spongepowered.asm.mixin.connect.IMixinConnector;
+
+public class MixinConnector implements IMixinConnector {
+    @Override
+    public void connect() {
+        Mixins.addConfiguration("betterfoliage.common.mixins.json");
+
+        try {
+            Class.forName("optifine.OptiFineTransformationService");
+            Mixins.addConfiguration("betterfoliage.optifine.mixins.json");
+        } catch (ClassNotFoundException e) {
+            Mixins.addConfiguration("betterfoliage.vanilla.mixins.json");
+        }
+
+    }
+}

src/main/java/mods/betterfoliage/loader/BetterFoliageLoader.java

@@ -1,38 +0,0 @@
-package mods.betterfoliage.loader;
-
-import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
-
-import java.util.Map;
-
-@IFMLLoadingPlugin.TransformerExclusions({
-    "mods.betterfoliage.loader",
-    "mods.octarinecore.metaprog",
-    "kotlin"
-})
-@IFMLLoadingPlugin.MCVersion("1.12.2")
-@IFMLLoadingPlugin.SortingIndex(1400)
-public class BetterFoliageLoader implements IFMLLoadingPlugin {
-    @Override
-    public String[] getASMTransformerClass() {
-        return new String[] { "mods.betterfoliage.loader.BetterFoliageTransformer" };
-    }
-
-    @Override
-    public String getModContainerClass() {
-        return null;
-    }
-
-    @Override
-    public String getSetupClass() {
-        return null;
-    }
-
-    @Override
-    public void injectData(Map<String, Object> data) {
-    }
-
-    @Override
-    public String getAccessTransformerClass() {
-        return null;
-    }
-}

src/main/java/mods/betterfoliage/mixin/BlockMixin.java

@@ -0,0 +1,29 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.client.Hooks;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.world.IBlockReader;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+/**
+ * Mixin overriding the {@link VoxelShape} used for the neighbor block in {@link Block}.shouldSideBeRendered().
+ *
+ * This way log blocks can be made to not block rendering, without altering any {@link Block} or
+ * {@link BlockState} properties with potential gameplay ramifications.
+ */
+@Mixin(Block.class)
+public class BlockMixin {
+    private static final String shouldSideBeRendered = "Lnet/minecraft/block/Block;shouldSideBeRendered(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Direction;)Z";
+    private static final String getVoxelShape = "Lnet/minecraft/block/BlockState;func_215702_a(Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Direction;)Lnet/minecraft/util/math/shapes/VoxelShape;";
+
+    @Redirect(method = shouldSideBeRendered, at = @At(value = "INVOKE", target = getVoxelShape, ordinal = 1))
+    private static VoxelShape getVoxelShapeOverride(BlockState state, IBlockReader reader, BlockPos pos, Direction dir) {
+        return Hooks.getVoxelShapeOverride(state, reader, pos, dir);
+    }
+}

src/main/java/mods/betterfoliage/mixin/BlockStateMixin.java

@@ -0,0 +1,26 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.client.Hooks;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockReader;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+/**
+ * Mixin to override the result of {@link BlockState}.getAmbientOcclusionLightValue().
+ *
+ * Needed to avoid excessive darkening of Round Logs at the corners, now that they are not full blocks.
+ */
+@Mixin(BlockState.class)
+public class BlockStateMixin {
+    private static final String callFrom = "Lnet/minecraft/block/BlockState;func_215703_d(Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;)F";
+    private static final String callTo = "Lnet/minecraft/block/Block;func_220080_a(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;)F";
+
+    @Redirect(method = callFrom, at = @At(value = "INVOKE", target = callTo))
+    float getAmbientOcclusionValue(Block block, BlockState state, IBlockReader reader, BlockPos pos) {
+        return Hooks.getAmbientOcclusionLightValueOverride(block.func_220080_a(state, reader, pos), state);
+    }
+}

src/main/java/mods/betterfoliage/mixin/ChunkRenderMixin.java

@@ -0,0 +1,29 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.client.Hooks;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.chunk.ChunkRender;
+import net.minecraft.util.BlockRenderLayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IEnviromentBlockReader;
+import net.minecraftforge.client.MinecraftForgeClient;
+import net.minecraftforge.client.model.data.IModelData;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.Random;
+
+@Mixin(ChunkRender.class)
+public class ChunkRenderMixin {
+
+    private static final String rebuildChunk = "Lnet/minecraft/client/renderer/chunk/ChunkRender;rebuildChunk(FFFLnet/minecraft/client/renderer/chunk/ChunkRenderTask;)V";
+    private static final String renderBlock = "Lnet/minecraft/client/renderer/BlockRendererDispatcher;renderBlock(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/IEnviromentBlockReader;Lnet/minecraft/client/renderer/BufferBuilder;Ljava/util/Random;Lnet/minecraftforge/client/model/data/IModelData;)Z";
+
+    @Redirect(method = rebuildChunk, at = @At(value = "INVOKE", target = renderBlock))
+    public boolean renderBlock(BlockRendererDispatcher dispatcher, BlockState state, BlockPos pos, IEnviromentBlockReader reader, BufferBuilder buffer, Random random, IModelData modelData) {
+        return Hooks.renderWorldBlock(dispatcher, state, pos, reader, buffer, random, modelData, MinecraftForgeClient.getRenderLayer());
+    }
+}

src/main/java/mods/betterfoliage/mixin/ChunkRenderOptifineMixin.java

@@ -0,0 +1,31 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.client.Hooks;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.renderer.chunk.ChunkRender;
+import net.minecraft.util.BlockRenderLayer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Coerce;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Slice;
+
+@Mixin(ChunkRender.class)
+public class ChunkRenderOptifineMixin {
+
+    private static final String rebuildChunk = "Lnet/minecraft/client/renderer/chunk/ChunkRender;rebuildChunk(FFFLnet/minecraft/client/renderer/chunk/ChunkRenderTask;)V";
+    private static final String invokeReflector = "Lnet/optifine/reflect/Reflector;callBoolean(Ljava/lang/Object;Lnet/optifine/reflect/ReflectorMethod;[Ljava/lang/Object;)Z";
+    private static final String forgeBlockCanRender = "Lnet/minecraft/client/renderer/chunk/ChunkRender;FORGE_BLOCK_CAN_RENDER_IN_LAYER:Z";
+
+    @Redirect(
+            method = rebuildChunk,
+            at = @At(value = "INVOKE", target = invokeReflector),
+            slice = @Slice(
+                    from = @At(value = "FIELD", target = forgeBlockCanRender)
+            )
+    )
+    @SuppressWarnings("UnresolvedMixinReference")
+    boolean canRenderInLayer(Object state, @Coerce Object reflector, Object[] layer) {
+        return Hooks.canRenderInLayerOverride((BlockState) state, (BlockRenderLayer) layer[0]);
+    }
+}

src/main/java/mods/betterfoliage/mixin/ChunkRenderVanillaMixin.java

@@ -0,0 +1,29 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.client.Hooks;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.chunk.ChunkRender;
+import net.minecraft.util.BlockRenderLayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IEnviromentBlockReader;
+import net.minecraftforge.client.MinecraftForgeClient;
+import net.minecraftforge.client.model.data.IModelData;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.Random;
+
+@Mixin(ChunkRender.class)
+public class ChunkRenderVanillaMixin {
+
+    private static final String rebuildChunk = "Lnet/minecraft/client/renderer/chunk/ChunkRender;rebuildChunk(FFFLnet/minecraft/client/renderer/chunk/ChunkRenderTask;)V";
+    private static final String canRenderInLayer = "Lnet/minecraft/block/BlockState;canRenderInLayer(Lnet/minecraft/util/BlockRenderLayer;)Z";
+
+    @Redirect(method = rebuildChunk, at = @At(value = "INVOKE", target = canRenderInLayer))
+    boolean canRenderInLayer(BlockState state, BlockRenderLayer layer) {
+        return Hooks.canRenderInLayerOverride(state, layer);
+    }
+}

src/main/java/mods/betterfoliage/mixin/ClientWorldMixin.java

@@ -0,0 +1,44 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.client.Hooks;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockReader;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.Random;
+
+@Mixin(ClientWorld.class)
+public class ClientWorldMixin {
+
+    private static final String worldAnimateTick = "Lnet/minecraft/client/world/ClientWorld;animateTick(IIIILjava/util/Random;ZLnet/minecraft/util/math/BlockPos$MutableBlockPos;)V";
+    private static final String blockAnimateTick = "Lnet/minecraft/block/Block;animateTick(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Ljava/util/Random;)V";
+
+    private static final String worldNotify = "Lnet/minecraft/client/world/ClientWorld;notifyBlockUpdate(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;I)V";
+    private static final String rendererNotify = "Lnet/minecraft/client/renderer/WorldRenderer;notifyBlockUpdate(Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;I)V";
+
+    /**
+     * Inject a callback to call for every random display tick. Used for adding custom particle effects to blocks.
+     */
+    @Redirect(method = worldAnimateTick, at = @At(value = "INVOKE", target = blockAnimateTick))
+    void onAnimateTick(Block block, BlockState state, World world, BlockPos pos, Random random) {
+        Hooks.onRandomDisplayTick(block, state, world, pos, random);
+        block.animateTick(state, world, pos, random);
+    }
+
+    /**
+     * Inject callback to get notified of client-side blockstate changes.
+     * Used to invalidate caches in the {@link mods.betterfoliage.client.chunk.ChunkOverlayManager}
+     */
+    @Redirect(method = worldNotify, at = @At(value = "INVOKE", target = rendererNotify))
+    void onClientBlockChanged(WorldRenderer renderer, IBlockReader world, BlockPos pos, BlockState oldState, BlockState newState, int flags) {
+        Hooks.onClientBlockChanged((ClientWorld) world, pos, oldState, newState, flags);
+        renderer.notifyBlockUpdate(world, pos, oldState, newState, flags);
+    }
+}

src/main/java/mods/betterfoliage/mixin/ModelBakeryMixin.java

@@ -0,0 +1,21 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.client.Hooks;
+import net.minecraft.client.renderer.model.ModelBakery;
+import net.minecraft.profiler.IProfiler;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ModelBakery.class)
+public class ModelBakeryMixin {
+
+    private static final String processLoading = "Lnet/minecraft/client/renderer/model/ModelBakery;processLoading(Lnet/minecraft/profiler/IProfiler;)V";
+    private static final String endStartSection = "Lnet/minecraft/profiler/IProfiler;endStartSection(Ljava/lang/String;)V";
+
+    @Inject(method = processLoading, at = @At(value = "INVOKE_STRING", target = endStartSection, args = "ldc=stitching"))
+    void preStitchTextures(IProfiler profiler, CallbackInfo ci) {
+        Hooks.onLoadModelDefinitions(this);
+    }
+}

src/main/java/optifine/OptifineTransformerDevWrapper.java

@@ -1,65 +0,0 @@
-package optifine;
-
-import net.minecraft.launchwrapper.IClassTransformer;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.stream.Stream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-public class OptifineTransformerDevWrapper implements IClassTransformer {
-
-    public static String OPTIFINE_CLASSNAME = "optifine/OptiFineClassTransformer.class";
-    private ZipFile ofZip = null;
-
-    public  OptifineTransformerDevWrapper() {
-        Stream<URL> loaderSources = Arrays.stream(((URLClassLoader) getClass().getClassLoader()).getURLs());
-        Optional<URL> optifineURL = loaderSources.filter(this::isOptifineJar).findFirst();
-        optifineURL.ifPresent(url -> ofZip = getZip(url));
-    }
-
-    private ZipFile getZip(URL url) {
-        try {
-            return new ZipFile(new File(url.toURI()));
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    private boolean isOptifineJar(URL url) {
-        ZipFile zip = getZip(url);
-        return zip != null && zip.getEntry(OPTIFINE_CLASSNAME) != null;
-    }
-
-    @Override
-    public byte[] transform(String name, String transformedName, byte[] basicClass) {
-        if (ofZip == null) return basicClass;
-        ZipEntry replacement = ofZip.getEntry(name.replace(".", "/") + ".class");
-        if (replacement == null) return basicClass;
-
-        try {
-            return readAll(ofZip.getInputStream(replacement));
-        } catch (IOException e) {
-            return basicClass;
-        }
-    }
-
-    private byte[] readAll(InputStream is) throws IOException {
-        byte[] buf = new byte[4096];
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        int len;
-        do {
-            len = is.read(buf, 0, 4096);
-            if (len > 0) bos.write(buf, 0, len);
-        } while (len > -1);
-        is.close();
-        return bos.toByteArray();
-    }
-}

src/main/java/optifine/OptifineTweakerDevWrapper.java

@@ -1,28 +0,0 @@
-package optifine;
-
-import net.minecraft.launchwrapper.ITweaker;
-import net.minecraft.launchwrapper.LaunchClassLoader;
-
-import java.io.File;
-import java.util.List;
-
-public class OptifineTweakerDevWrapper implements ITweaker {
-    @Override
-    public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) {
-    }
-
-    @Override
-    public void injectIntoClassLoader(LaunchClassLoader classLoader) {
-        classLoader.registerTransformer("optifine.OptifineTransformerDevWrapper");
-    }
-
-    @Override
-    public String getLaunchTarget() {
-        return "net.minecraft.client.main.Main";
-    }
-
-    @Override
-    public String[] getLaunchArguments() {
-        return new String[0];
-    }
-}