wynd
/
finalbeta
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disabled the id tags in F3 mode and config option for this

master
Wynd 2023-10-07 15:39:21 +03:00
parent 166c43d9c4
commit 26d3b8207d
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/xyz/pixelatedw/finalbeta/ModConfig.java
View File

@ -17,9 +17,10 @@ public class ModConfig {
public static final Option<Boolean> SUGAR_CANE_ON_SAND = make("Sugar Cane on sand", true, "Allows sugar canes to be placed on sand"); public static final Option<Boolean> SUGAR_CANE_ON_SAND = make("Sugar Cane on sand", true, "Allows sugar canes to be placed on sand");
public static final Option<Boolean> ADD_MORE_SOUNDS = make("Add more sounds", true, public static final Option<Boolean> ADD_MORE_SOUNDS = make("Add more sounds", true,
"Links a few more sounds from your local 'resources' folder with the game, namely for item breaking, minecarts and chests"); "Links a few more sounds from your local 'resources' folder with the game, namely for item breaking, minecarts and chests");
public static final Option<Boolean> ENABLE_CLOUDS = make("Enable Clouds", true, public static final Option<Boolean> ENABLE_CLOUDS = make("Enable Clouds", true, "Enables the rendering of clouds");
"Enables the rendering of clouds"); public static final Option<Boolean> DISABLE_ID_TAGS = make("Disable ID Tags", true,
"Disables id tags showing above entities in F3 mode");
public static final Option<Boolean> FIX_BOW_MODEL = make("Fix bow model", true, public static final Option<Boolean> FIX_BOW_MODEL = make("Fix bow model", true,
"Makes the box model held by players and skeletons bigger and facing forward"); "Makes the box model held by players and skeletons bigger and facing forward");
public static final Option<Boolean> FIX_MINECART_FLICKERING = make("Fix minecart flickering", true, public static final Option<Boolean> FIX_MINECART_FLICKERING = make("Fix minecart flickering", true,
@ -38,7 +39,7 @@ public class ModConfig {
"Fixes saddles not dropping when killing saddled pigs"); "Fixes saddles not dropping when killing saddled pigs");
public static final Option<Boolean> FIX_FURNACE_LAVA_BUCKET = make("Fix furnace lava bucket", true, public static final Option<Boolean> FIX_FURNACE_LAVA_BUCKET = make("Fix furnace lava bucket", true,
"Fixes furnaces consuming the bucket when using lava buckets as fuel"); "Fixes furnaces consuming the bucket when using lava buckets as fuel");
private static ModConfig instance = new ModConfig(); private static ModConfig instance = new ModConfig();
public static final ModConfig instance() { public static final ModConfig instance() {
return instance; return instance;
@ -77,7 +78,7 @@ public class ModConfig {
public <T> T get(Option<T> o) { public <T> T get(Option<T> o) {
return this.fileConfig.getOrElse(o.name, o.defaultValue); return this.fileConfig.getOrElse(o.name, o.defaultValue);
} }
public <T> T set(Option<T> o, T value) { public <T> T set(Option<T> o, T value) {
return this.fileConfig.set(o.name, value); return this.fileConfig.set(o.name, value);
} }
@ -101,7 +102,7 @@ public class ModConfig {
public T get() { public T get() {
return ModConfig.instance().get(this); return ModConfig.instance().get(this);
} }
public void set(T value) { public void set(T value) {
ModConfig.instance().set(this, value); ModConfig.instance().set(this, value);
} }

12
src/main/java/xyz/pixelatedw/finalbeta/mixin/LivingEntityRendererMixin.java
View File

@ -2,9 +2,14 @@ package xyz.pixelatedw.finalbeta.mixin;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.client.render.entity.LivingEntityRenderer;
import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.client.render.entity.model.EntityModel;
import net.minecraft.entity.LivingEntity;
import xyz.pixelatedw.finalbeta.ModConfig;
@Mixin(LivingEntityRenderer.class) @Mixin(LivingEntityRenderer.class)
public class LivingEntityRendererMixin { public class LivingEntityRendererMixin {
@ -13,4 +18,11 @@ public class LivingEntityRendererMixin {
@Shadow @Shadow
protected EntityModel model; protected EntityModel model;
@Inject(method = "method_821", at = @At("HEAD"), cancellable = true)
public void method_821(LivingEntity entity, double d, double d1, double d2, CallbackInfo ci) {
if (ModConfig.DISABLE_ID_TAGS.get()) {
ci.cancel();
}
}
} }