Natura + Tinker's Construct berry bush leaf mode support

This commit is contained in:
jss2a98aj authored and Jason Mitchell committed 2024-05-05 13:42:36 -07:00
1 parent d8d8cd93c5
commit 894b9573db
6 files changed
+253

No files matched your search

@@ -271,6 +271,15 @@ public enum Mixins {
"MixinRenderItem"
))
),
NOTFINE_NATURA(new Builder("NotFine Natura compat")
.setSide(Side.CLIENT).setPhase(Phase.LATE)
.setApplyIf(() -> AngelicaConfig.enableNotFineFeatures)
.addTargetedMod(TargetedMod.NATURA)
.addMixinClasses(addPrefix("notfine.leaves.natura.",
"MixinBerryBush",
"MixinNetherBerryBush"
))
),
NOTFINE_THAUMCRAFT(new Builder("NotFine Thaumcraft compat")
.setSide(Side.CLIENT).setPhase(Phase.LATE)
.setApplyIf(() -> AngelicaConfig.enableNotFineFeatures)
@@ -287,6 +296,12 @@ public enum Mixins {
"MixinBlockTable"
))
),
NOTFINE_TINKERS_CONSTRUCT(new Builder("NotFine Tinker's Construct compat")
.setSide(Side.CLIENT).setPhase(Phase.LATE)
.setApplyIf(() -> AngelicaConfig.enableNotFineFeatures)
.addTargetedMod(TargetedMod.TINKERS_CONSTRUCT)
.addMixinClasses("notfine.leaves.tconstruct.MixinOreberryBush")
),
NOTFINE_WITCHERY(new Builder("NotFine Witchery compat")
.setSide(Side.CLIENT).setPhase(Phase.LATE)
.setApplyIf(() -> AngelicaConfig.enableNotFineFeatures)
@@ -21,9 +21,11 @@ public enum TargetedMod {
, JOURNEYMAP("JourneyMap", null, "journeymap")
, LWJGL3IFY("lwjgl3ify", "me.eigenraven.lwjgl3ify.core.Lwjgl3ifyCoremod", "lwjgl3ify")
, MRTJPCORE("MrTJPCore", null, "MrTJPCoreMod")
, NATURA("Natura", null, "Natura")
, PROJECTRED_ILLUMINATION("ProjectRed Illumination", null, "ProjRed|Illumination")
, SMART_RENDER("Smart Render", null, "SmartRender")
, THAUMCRAFT("Thaumcraft", null, "Thaumcraft")
, TINKERS_CONSTRUCT("Tinker's Construct", null, "TConstruct")
, TWILIGHT_FOREST("TwilightForest", null, "TwilightForest")
, WITCHERY("Witchery", null, "witchery")
;
@@ -0,0 +1,78 @@
package com.gtnewhorizons.angelica.mixins.late.notfine.leaves.natura;
import jss.notfine.core.Settings;
import jss.notfine.core.SettingsManager;
import jss.notfine.gui.options.named.LeavesQuality;
import jss.notfine.util.IFaceObstructionCheckHelper;
import jss.notfine.util.ILeafBlock;
import jss.notfine.util.LeafRenderUtil;
import mods.natura.blocks.crops.BerryBush;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.util.Facing;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
@Mixin(value = BerryBush.class)
public abstract class MixinBerryBush extends Block implements IFaceObstructionCheckHelper, ILeafBlock {
@Override
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
final int metadata = world.getBlockMetadata(x, y, z);
int maskedMeta = metadata % 4 + (metadata < 12 ? 0 : 4);
boolean renderMode;
if(Settings.MODE_LEAVES.option.getStore() == LeavesQuality.SHELLED_FAST) {
if(metadata < 8) {
renderMode = false;
} else {
x += Facing.offsetsXForSide[side];
y += Facing.offsetsYForSide[side];
z += Facing.offsetsZForSide[side];
final Block otherBlock = world.getBlock(x, y, z);
renderMode = otherBlock instanceof ILeafBlock leafBlock && leafBlock.isFullLeaf(world, x, y, z);
}
} else {
renderMode = SettingsManager.leavesOpaque;
}
maskedMeta = maskedMeta >= (renderMode ? fastIcons : fancyIcons).length ? 0 : maskedMeta;
return (renderMode ? fastIcons : fancyIcons)[maskedMeta];
}
/**
* @author jss2a98aj
* @reason Support new leaf rendering modes on Natura leaves.
*/
@Overwrite
public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
if (side != 0 && maxY < 1f) {
return true;
}
return LeafRenderUtil.shouldSideBeRendered(world, x, y, z, side);
}
@Override
public boolean isFaceNonObstructing(IBlockAccess world, int x, int y, int z, int side, double otherMinX, double otherMinY, double otherMinZ, double otherMaxX, double otherMaxY, double otherMaxZ) {
if(world.getBlockMetadata(x ,y, z) < 8) {
return true;
}
return LeafRenderUtil.isFaceNonObstructing(world, x, y, z);
}
@Override
public boolean isFullLeaf(IBlockAccess world, int x, int y, int z) {
return world.getBlockMetadata(x ,y, z) >= 8;
}
@Shadow(remap = false)
public IIcon[] fastIcons;
@Shadow(remap = false)
public IIcon[] fancyIcons;
private MixinBerryBush(Material materialIn) {
super(materialIn);
}
}
@@ -0,0 +1,78 @@
package com.gtnewhorizons.angelica.mixins.late.notfine.leaves.natura;
import jss.notfine.core.Settings;
import jss.notfine.core.SettingsManager;
import jss.notfine.gui.options.named.LeavesQuality;
import jss.notfine.util.IFaceObstructionCheckHelper;
import jss.notfine.util.ILeafBlock;
import jss.notfine.util.LeafRenderUtil;
import mods.natura.blocks.crops.NetherBerryBush;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.util.Facing;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
@Mixin(value = NetherBerryBush.class)
public abstract class MixinNetherBerryBush extends Block implements IFaceObstructionCheckHelper, ILeafBlock {
@Override
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
final int metadata = world.getBlockMetadata(x, y, z);
int maskedMeta = metadata % 4 + (metadata < 12 ? 0 : 4);
boolean renderMode;
if(Settings.MODE_LEAVES.option.getStore() == LeavesQuality.SHELLED_FAST) {
if(metadata < 8) {
renderMode = false;
} else {
x += Facing.offsetsXForSide[side];
y += Facing.offsetsYForSide[side];
z += Facing.offsetsZForSide[side];
final Block otherBlock = world.getBlock(x, y, z);
renderMode = otherBlock instanceof ILeafBlock leafBlock && leafBlock.isFullLeaf(world, x, y, z);
}
} else {
renderMode = SettingsManager.leavesOpaque;
}
maskedMeta = maskedMeta >= (renderMode ? fastIcons : fancyIcons).length ? 0 : maskedMeta;
return (renderMode ? fastIcons : fancyIcons)[maskedMeta];
}
/**
* @author jss2a98aj
* @reason Support new leaf rendering modes on Natura leaves.
*/
@Overwrite
public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
if (side != 0 && maxY < 1f) {
return true;
}
return LeafRenderUtil.shouldSideBeRendered(world, x, y, z, side);
}
@Override
public boolean isFaceNonObstructing(IBlockAccess world, int x, int y, int z, int side, double otherMinX, double otherMinY, double otherMinZ, double otherMaxX, double otherMaxY, double otherMaxZ) {
if(world.getBlockMetadata(x ,y, z) < 8) {
return true;
}
return LeafRenderUtil.isFaceNonObstructing(world, x, y, z);
}
@Override
public boolean isFullLeaf(IBlockAccess world, int x, int y, int z) {
return world.getBlockMetadata(x ,y, z) >= 8;
}
@Shadow(remap = false)
public IIcon[] fastIcons;
@Shadow(remap = false)
public IIcon[] fancyIcons;
private MixinNetherBerryBush(Material materialIn) {
super(materialIn);
}
}
@@ -0,0 +1,78 @@
package com.gtnewhorizons.angelica.mixins.late.notfine.leaves.tconstruct;
import jss.notfine.core.Settings;
import jss.notfine.core.SettingsManager;
import jss.notfine.gui.options.named.LeavesQuality;
import jss.notfine.util.IFaceObstructionCheckHelper;
import jss.notfine.util.ILeafBlock;
import jss.notfine.util.LeafRenderUtil;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.util.Facing;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import tconstruct.world.blocks.OreberryBush;
@Mixin(value = OreberryBush.class)
public abstract class MixinOreberryBush extends Block implements IFaceObstructionCheckHelper, ILeafBlock {
@Override
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
final int metadata = world.getBlockMetadata(x, y, z);
int maskedMeta = metadata % 4 + (metadata < 12 ? 0 : 4);
boolean renderMode;
if(Settings.MODE_LEAVES.option.getStore() == LeavesQuality.SHELLED_FAST) {
if(metadata < 8) {
renderMode = false;
} else {
x += Facing.offsetsXForSide[side];
y += Facing.offsetsYForSide[side];
z += Facing.offsetsZForSide[side];
final Block otherBlock = world.getBlock(x, y, z);
renderMode = otherBlock instanceof ILeafBlock leafBlock && leafBlock.isFullLeaf(world, x, y, z);
}
} else {
renderMode = SettingsManager.leavesOpaque;
}
maskedMeta = maskedMeta >= (renderMode ? fastIcons : fancyIcons).length ? 0 : maskedMeta;
return (renderMode ? fastIcons : fancyIcons)[maskedMeta];
}
/**
* @author jss2a98aj
* @reason Support new leaf rendering modes on Tinker's Construct leaves.
*/
@Overwrite
public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
if (side != 0 && maxY < 1f) {
return true;
}
return LeafRenderUtil.shouldSideBeRendered(world, x, y, z, side);
}
@Override
public boolean isFaceNonObstructing(IBlockAccess world, int x, int y, int z, int side, double otherMinX, double otherMinY, double otherMinZ, double otherMaxX, double otherMaxY, double otherMaxZ) {
if(world.getBlockMetadata(x ,y, z) < 8) {
return true;
}
return LeafRenderUtil.isFaceNonObstructing(world, x, y, z);
}
@Override
public boolean isFullLeaf(IBlockAccess world, int x, int y, int z) {
return world.getBlockMetadata(x ,y, z) >= 8;
}
@Shadow(remap = false)
public IIcon[] fastIcons;
@Shadow(remap = false)
public IIcon[] fancyIcons;
private MixinOreberryBush(Material material) {
super(material);
}
}