MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Chorus mixin fixes

Browse source
This commit is contained in:
paulevsGitch 2021-01-11 11:24:49 +03:00
parent 1ea5f5a52a
commit 8f8a3e08e7
23 changed files with 37 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/ru/betterend/mixin/client/AnvilScreenMixin.java
View file

@ -23,7 +23,6 @@ import net.minecraft.screen.ScreenHandler;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import ru.betterend.interfaces.AnvilScreenHandlerExtended;
@Mixin(AnvilScreen.class)

12
src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java
View file

@ -10,6 +10,7 @@ import org.spongepowered.asm.mixin.Mixin;
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.ModifyVariable;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.block.Block;
@ -20,13 +21,12 @@ import net.minecraft.resource.Resource;
import net.minecraft.resource.ResourceManager;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.BetterEnd;
import ru.betterend.patterns.Patterned;
import ru.betterend.world.generator.GeneratorOptions;
@Mixin(ModelLoader.class)
public class ModelLoaderMixin {
@Final
@Shadow
private ResourceManager resourceManager;
@ -81,4 +81,12 @@ public class ModelLoaderMixin {
return model;
}
@ModifyVariable(method = "loadModel", ordinal = 2, at = @At(value = "INVOKE"))
public Identifier be_SwitchModel(Identifier id) {
if (GeneratorOptions.changeChorusPlant() && id.getNamespace().equals("minecraft") && id.getPath().startsWith("blockstates/") && id.getPath().contains("chorus") && !id.getPath().contains("custom_")) {
id = new Identifier(id.getPath().replace("chorus", "custom_chorus"));
}
return id;
}
}

1
src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java
View file

@ -13,7 +13,6 @@ import com.google.gson.Gson;
import net.minecraft.block.Block;
import net.minecraft.client.render.model.json.ModelVariantMap;
import net.minecraft.util.JsonHelper;
import ru.betterend.patterns.BlockPatterned;
@Mixin(ModelVariantMap.class)

1
src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java
View file

@ -16,7 +16,6 @@ import net.minecraft.resource.NamespaceResourceManager;
import net.minecraft.resource.Resource;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.BetterEnd;
import ru.betterend.patterns.BlockPatterned;

1
src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java
View file

@ -21,7 +21,6 @@ import net.minecraft.screen.ForgingScreenHandler;
import net.minecraft.screen.ScreenHandlerContext;
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.tag.BlockTags;
import ru.betterend.interfaces.AnvilScreenHandlerExtended;
import ru.betterend.recipe.builders.AnvilRecipe;

1
src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java
View file

@ -20,7 +20,6 @@ import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import net.minecraft.world.WorldAccess;
import net.minecraft.world.WorldView;
import ru.betterend.config.Configs;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndTags;
import ru.betterend.util.BlocksHelper;

1
src/main/java/ru/betterend/mixin/common/EntityMixin.java
View file

@ -15,7 +15,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.TeleportTarget;
import net.minecraft.world.World;
import ru.betterend.interfaces.TeleportingEntity;
@Mixin(Entity.class)

3
src/main/java/ru/betterend/mixin/common/PlayerAdvancementTrackerMixin.java
View file

@ -3,14 +3,13 @@ package ru.betterend.mixin.common;
import org.spongepowered.asm.mixin.Mixin;
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.At.Shift;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.advancement.Advancement;
import net.minecraft.advancement.PlayerAdvancementTracker;
import net.minecraft.server.network.ServerPlayerEntity;
import ru.betterend.events.PlayerAdvancementsEvents;
@Mixin(PlayerAdvancementTracker.class)