Repo-Mirror/NitoriMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

waowaowaowaowaow (implemented 0065-some-entity-micro-opts.patch)

Browse Source
This commit is contained in:
DoggySazHi
2024-03-06 22:14:12 -08:00
parent 9846396345
commit e6a72021f3
3 changed files with 128 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/net/gensokyoreimagined/nitori/core/MixinEntity.java Normal file
View File

@@ -0,0 +1,54 @@
// Nitori Copyright (C) 2024 Gensokyo Reimagined
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU 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 General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
package net.gensokyoreimagined.nitori.core;
import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec3;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(Entity.class)
public abstract class MixinEntity {
@Shadow private Level level;
@Shadow public abstract int getBlockX();
@Shadow public abstract double getEyeY();
@Shadow public abstract int getBlockZ();
@Shadow private Vec3 position;
/**
* Implementation of 0065-some-entity-micro-opts.patch
*/
@Unique
public float gensouHacks$getLightLevelDependentMagicValue(BlockPos pos) {
return this.level.hasChunkAt(this.getBlockX(), this.getBlockZ()) ? this.level.getLightLevelDependentMagicValue(pos) : 0.0F;
}
/**
* Implementation of 0065-some-entity-micro-opts.patch
*/
@Inject(method = "getLightLevelDependentMagicValue", at = @At("HEAD"), cancellable = true)
private void getLightLevelDependentMagicValue(CallbackInfoReturnable<Float> cir) {
cir.setReturnValue(this.gensouHacks$getLightLevelDependentMagicValue(new BlockPos(this.getBlockX(), (int) this.getEyeY(), this.getBlockZ())));
cir.cancel();
}
}

71
src/main/java/net/gensokyoreimagined/nitori/core/MixinMob.java Normal file
View File

@@ -0,0 +1,71 @@
// Nitori Copyright (C) 2024 Gensokyo Reimagined
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU 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 General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
package net.gensokyoreimagined.nitori.core;
import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.Mob;
import net.minecraft.world.level.Level;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(Mob.class)
public abstract class MixinMob extends LivingEntity {
@Unique
private BlockPos gensouHacks$cachedEyeBlockPos;
@Unique
private int gensouHacks$cachedPositionHashcode;
protected MixinMob(EntityType<? extends LivingEntity> type, Level world) {
super(type, world);
}
@Inject(method = "isSunBurnTick", at = @At("HEAD"), cancellable = true)
private void isSunBurnTick(CallbackInfoReturnable<Boolean> cir) {
if (this.level().isDay() && !this.level().isClientSide) {
int positionHashCode = this.position().hashCode();
if (this.gensouHacks$cachedPositionHashcode != positionHashCode) {
this.gensouHacks$cachedEyeBlockPos = new BlockPos((int) this.getX(), (int) this.getEyeY(), (int) this.getZ());
this.gensouHacks$cachedPositionHashcode = positionHashCode;
}
float f = this.level().hasChunkAt(this.getBlockX(), this.getBlockZ()) ? this.level().getLightLevelDependentMagicValue(gensouHacks$cachedEyeBlockPos) : 0.0F;
// Check brightness first
if (f <= 0.5F)
{
cir.setReturnValue(false);
cir.cancel();
}
if (this.random.nextFloat() * 30.0F >= (f - 0.4F) * 2.0F)
{
cir.setReturnValue(false);
cir.cancel();
}
boolean flag = this.isInWaterRainOrBubble() || this.isInPowderSnow || this.wasInPowderSnow;
if (!flag && this.level().canSeeSky(gensouHacks$cachedEyeBlockPos)) {
cir.setReturnValue(true);
cir.cancel();
}
}
}
}

4
src/main/resources/mixins.core.json
View File

@@ -15,6 +15,8 @@
"MixinMth",
"MixinBlock",
"MixinGameRules",
"MixinPlayer"
"MixinPlayer",
"MixinEntity",
"MixinMob"
]
}