diff --git a/src/main/java/ru/betterend/BetterEnd.java b/src/main/java/ru/betterend/BetterEnd.java index 2b43e135..fb2c2b54 100644 --- a/src/main/java/ru/betterend/BetterEnd.java +++ b/src/main/java/ru/betterend/BetterEnd.java @@ -13,11 +13,11 @@ import ru.betterend.events.PlayerAdvancementsEvents; import ru.betterend.integration.Integrations; import ru.betterend.item.GuideBookItem; import ru.betterend.recipe.AlloyingRecipes; +import ru.betterend.recipe.AnvilRecipes; import ru.betterend.recipe.CraftingRecipes; import ru.betterend.recipe.FurnaceRecipes; import ru.betterend.recipe.InfusionRecipes; import ru.betterend.recipe.SmithingRecipes; -import ru.betterend.recipe.AnvilRecipes; import ru.betterend.registry.EndBiomes; import ru.betterend.registry.EndBlockEntities; import ru.betterend.registry.EndBlocks; diff --git a/src/main/java/ru/betterend/blocks/BlueVineSeedBlock.java b/src/main/java/ru/betterend/blocks/BlueVineSeedBlock.java index 5a2ae3f4..38812d8c 100644 --- a/src/main/java/ru/betterend/blocks/BlueVineSeedBlock.java +++ b/src/main/java/ru/betterend/blocks/BlueVineSeedBlock.java @@ -7,8 +7,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.StructureWorldAccess; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.FurBlock; import ru.betterend.blocks.basis.EndPlantWithAgeBlock; +import ru.betterend.blocks.basis.FurBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; diff --git a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java index ffb43ed3..f159d795 100644 --- a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java @@ -12,9 +12,9 @@ import ru.betterend.blocks.basis.EndPillarBlock; import ru.betterend.blocks.basis.EndSlabBlock; import ru.betterend.blocks.basis.EndStairsBlock; import ru.betterend.blocks.basis.EndStoneButtonBlock; -import ru.betterend.blocks.basis.StoneLanternBlock; import ru.betterend.blocks.basis.EndStonelateBlock; import ru.betterend.blocks.basis.EndWallBlock; +import ru.betterend.blocks.basis.StoneLanternBlock; import ru.betterend.recipe.CraftingRecipes; import ru.betterend.recipe.builders.GridRecipe; import ru.betterend.registry.EndBlocks; diff --git a/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java b/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java index 28c2c031..31fe3b18 100644 --- a/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java @@ -11,9 +11,9 @@ import net.minecraft.tag.BlockTags; import net.minecraft.tag.ItemTags; import net.minecraft.tag.Tag; import ru.betterend.blocks.basis.BarkBlock; -import ru.betterend.blocks.basis.StrippableBarkBlock; -import ru.betterend.blocks.basis.EndBarrelBlock; import ru.betterend.blocks.basis.BaseBlock; +import ru.betterend.blocks.basis.EndBarrelBlock; +import ru.betterend.blocks.basis.EndBlockStripableLogLog; import ru.betterend.blocks.basis.EndBookshelfBlock; import ru.betterend.blocks.basis.EndChestBlock; import ru.betterend.blocks.basis.EndComposterBlock; @@ -22,7 +22,6 @@ import ru.betterend.blocks.basis.EndDoorBlock; import ru.betterend.blocks.basis.EndFenceBlock; import ru.betterend.blocks.basis.EndGateBlock; import ru.betterend.blocks.basis.EndLadderBlock; -import ru.betterend.blocks.basis.EndBlockStripableLogLog; import ru.betterend.blocks.basis.EndPillarBlock; import ru.betterend.blocks.basis.EndPlateBlock; import ru.betterend.blocks.basis.EndSignBlock; @@ -30,6 +29,7 @@ import ru.betterend.blocks.basis.EndSlabBlock; import ru.betterend.blocks.basis.EndStairsBlock; import ru.betterend.blocks.basis.EndTrapdoorBlock; import ru.betterend.blocks.basis.EndWoodenButtonBlock; +import ru.betterend.blocks.basis.StrippableBarkBlock; import ru.betterend.recipe.builders.GridRecipe; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; diff --git a/src/main/java/ru/betterend/integration/byg/BYGBlocks.java b/src/main/java/ru/betterend/integration/byg/BYGBlocks.java index 93e16e8c..27717ff7 100644 --- a/src/main/java/ru/betterend/integration/byg/BYGBlocks.java +++ b/src/main/java/ru/betterend/integration/byg/BYGBlocks.java @@ -1,8 +1,8 @@ package ru.betterend.integration.byg; import net.minecraft.block.Block; -import ru.betterend.blocks.basis.VineBlock; import ru.betterend.blocks.basis.EndWallPlantBlock; +import ru.betterend.blocks.basis.VineBlock; import ru.betterend.registry.EndBlocks; public class BYGBlocks { diff --git a/src/main/java/ru/betterend/mixin/client/AnvilScreenMixin.java b/src/main/java/ru/betterend/mixin/client/AnvilScreenMixin.java index 1e2d76ce..4577283f 100644 --- a/src/main/java/ru/betterend/mixin/client/AnvilScreenMixin.java +++ b/src/main/java/ru/betterend/mixin/client/AnvilScreenMixin.java @@ -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) diff --git a/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java b/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java index b2688d0b..c3f922a4 100644 --- a/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java +++ b/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java @@ -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; + } } diff --git a/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java b/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java index 5b3cf1dc..c742bf18 100644 --- a/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java +++ b/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java @@ -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) diff --git a/src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java b/src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java index 64c8f889..a1c5ad08 100644 --- a/src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java +++ b/src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java @@ -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; diff --git a/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java b/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java index 28ecb95c..c90e7f81 100644 --- a/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java +++ b/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java @@ -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; diff --git a/src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java b/src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java index 79010145..10fcef63 100644 --- a/src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java +++ b/src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java @@ -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; diff --git a/src/main/java/ru/betterend/mixin/common/EntityMixin.java b/src/main/java/ru/betterend/mixin/common/EntityMixin.java index ff6420a3..59027c53 100644 --- a/src/main/java/ru/betterend/mixin/common/EntityMixin.java +++ b/src/main/java/ru/betterend/mixin/common/EntityMixin.java @@ -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) diff --git a/src/main/java/ru/betterend/mixin/common/PlayerAdvancementTrackerMixin.java b/src/main/java/ru/betterend/mixin/common/PlayerAdvancementTrackerMixin.java index 43220b04..2acef8ea 100644 --- a/src/main/java/ru/betterend/mixin/common/PlayerAdvancementTrackerMixin.java +++ b/src/main/java/ru/betterend/mixin/common/PlayerAdvancementTrackerMixin.java @@ -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) diff --git a/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java b/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java index f6bcb41e..5a876161 100644 --- a/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java @@ -17,7 +17,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; import net.minecraft.util.collection.DefaultedList; import net.minecraft.world.World; - import ru.betterend.BetterEnd; import ru.betterend.config.Configs; import ru.betterend.interfaces.BetterEndRecipe; diff --git a/src/main/java/ru/betterend/recipe/builders/SmithingTableRecipe.java b/src/main/java/ru/betterend/recipe/builders/SmithingTableRecipe.java index 7bde239e..d5935492 100644 --- a/src/main/java/ru/betterend/recipe/builders/SmithingTableRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/SmithingTableRecipe.java @@ -8,7 +8,6 @@ import net.minecraft.recipe.RecipeType; import net.minecraft.recipe.SmithingRecipe; import net.minecraft.tag.Tag; import net.minecraft.util.Identifier; - import ru.betterend.BetterEnd; import ru.betterend.config.Configs; import ru.betterend.recipe.EndRecipeManager; diff --git a/src/main/java/ru/betterend/registry/EndBlockEntities.java b/src/main/java/ru/betterend/registry/EndBlockEntities.java index 47fb5a14..c3e6d87b 100644 --- a/src/main/java/ru/betterend/registry/EndBlockEntities.java +++ b/src/main/java/ru/betterend/registry/EndBlockEntities.java @@ -15,8 +15,8 @@ import ru.betterend.blocks.EternalPedestal; import ru.betterend.blocks.InfusionPedestal; import ru.betterend.blocks.basis.EndBarrelBlock; import ru.betterend.blocks.basis.EndChestBlock; -import ru.betterend.blocks.basis.PedestalBlock; import ru.betterend.blocks.basis.EndSignBlock; +import ru.betterend.blocks.basis.PedestalBlock; import ru.betterend.blocks.entities.BlockEntityHydrothermalVent; import ru.betterend.blocks.entities.EBarrelBlockEntity; import ru.betterend.blocks.entities.EChestBlockEntity; diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 5dc5a0c0..44050d9e 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -8,9 +8,9 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import ru.betterend.BetterEnd; import ru.betterend.blocks.AeterniumBlock; -import ru.betterend.blocks.AuroraCrystalBlock; import ru.betterend.blocks.AmberBlock; import ru.betterend.blocks.AncientEmeraldIceBlock; +import ru.betterend.blocks.AuroraCrystalBlock; import ru.betterend.blocks.BlueVineBlock; import ru.betterend.blocks.BlueVineLanternBlock; import ru.betterend.blocks.BlueVineSeedBlock; @@ -32,7 +32,14 @@ import ru.betterend.blocks.EndLotusFlowerBlock; import ru.betterend.blocks.EndLotusLeafBlock; import ru.betterend.blocks.EndLotusSeedBlock; import ru.betterend.blocks.EndLotusStemBlock; +import ru.betterend.blocks.EndPathBlock; +import ru.betterend.blocks.EndPortalBlock; +import ru.betterend.blocks.EndStoneSmelter; +import ru.betterend.blocks.EndTerrainBlock; +import ru.betterend.blocks.EnderBlock; import ru.betterend.blocks.EndstoneDustBlock; +import ru.betterend.blocks.EternalPedestal; +import ru.betterend.blocks.EternalRunedFlavolite; import ru.betterend.blocks.GlowingMossBlock; import ru.betterend.blocks.GlowingPillarLuminophorBlock; import ru.betterend.blocks.GlowingPillarRootsBlock; @@ -44,6 +51,7 @@ import ru.betterend.blocks.HydraluxPetalBlock; import ru.betterend.blocks.HydraluxPetalColoredBlock; import ru.betterend.blocks.HydraluxSaplingBlock; import ru.betterend.blocks.HydrothermalVentBlock; +import ru.betterend.blocks.InfusionPedestal; import ru.betterend.blocks.JellyshroomCapBlock; import ru.betterend.blocks.LacugroveSaplingBlock; import ru.betterend.blocks.LanceleafBlock; @@ -55,9 +63,10 @@ import ru.betterend.blocks.MossyGlowshroomHymenophoreBlock; import ru.betterend.blocks.MossyGlowshroomSaplingBlock; import ru.betterend.blocks.MurkweedBlock; import ru.betterend.blocks.NeedlegrassBlock; -import ru.betterend.blocks.EndPathBlock; +import ru.betterend.blocks.PedestalVanilla; import ru.betterend.blocks.PythadendronSaplingBlock; import ru.betterend.blocks.RespawnObeliskBlock; +import ru.betterend.blocks.RunedFlavolite; import ru.betterend.blocks.ShadowBerryBlock; import ru.betterend.blocks.ShadowGrassBlock; import ru.betterend.blocks.SilkMothNestBlock; @@ -65,7 +74,7 @@ import ru.betterend.blocks.SmallJellyshroomBlock; import ru.betterend.blocks.SulphurCrystalBlock; import ru.betterend.blocks.TenaneaFlowersBlock; import ru.betterend.blocks.TenaneaSaplingBlock; -import ru.betterend.blocks.EndTerrainBlock; +import ru.betterend.blocks.TerminiteBlock; import ru.betterend.blocks.TerrainPlantBlock; import ru.betterend.blocks.TwistedUmbrellaMossBlock; import ru.betterend.blocks.TwistedUmbrellaMossTallBlock; @@ -76,25 +85,16 @@ import ru.betterend.blocks.UmbrellaTreeClusterEmptyBlock; import ru.betterend.blocks.UmbrellaTreeMembraneBlock; import ru.betterend.blocks.UmbrellaTreeSaplingBlock; import ru.betterend.blocks.VentBubbleColumnBlock; -import ru.betterend.blocks.EndPortalBlock; -import ru.betterend.blocks.EndStoneSmelter; -import ru.betterend.blocks.EnderBlock; -import ru.betterend.blocks.EternalPedestal; -import ru.betterend.blocks.EternalRunedFlavolite; -import ru.betterend.blocks.InfusionPedestal; -import ru.betterend.blocks.PedestalVanilla; -import ru.betterend.blocks.RunedFlavolite; -import ru.betterend.blocks.TerminiteBlock; -import ru.betterend.blocks.basis.FurBlock; import ru.betterend.blocks.basis.EndCropBlock; import ru.betterend.blocks.basis.EndLeavesBlock; import ru.betterend.blocks.basis.EndOreBlock; +import ru.betterend.blocks.basis.EndUnderwaterWallPlantBlock; +import ru.betterend.blocks.basis.EndWallPlantBlock; +import ru.betterend.blocks.basis.FurBlock; import ru.betterend.blocks.basis.SimpleLeavesBlock; import ru.betterend.blocks.basis.StoneLanternBlock; -import ru.betterend.blocks.basis.EndUnderwaterWallPlantBlock; import ru.betterend.blocks.basis.VineBlock; import ru.betterend.blocks.basis.WallMushroomBlock; -import ru.betterend.blocks.basis.EndWallPlantBlock; import ru.betterend.blocks.complex.ColoredMaterial; import ru.betterend.blocks.complex.StoneMaterial; import ru.betterend.blocks.complex.WoodenMaterial; diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index 44a10254..cc72a360 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -34,14 +34,14 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.registry.Registry; import ru.betterend.BetterEnd; import ru.betterend.config.Configs; +import ru.betterend.item.DrinkItem; import ru.betterend.item.EnchantedPetalItem; import ru.betterend.item.EndAxeItem; import ru.betterend.item.EndHammerItem; import ru.betterend.item.EndHoeItem; import ru.betterend.item.EndPickaxeItem; -import ru.betterend.item.EternalCrystalItem; -import ru.betterend.item.DrinkItem; import ru.betterend.item.EndSpawnEggItem; +import ru.betterend.item.EternalCrystalItem; import ru.betterend.item.PatternedItem; import ru.betterend.item.material.EndArmorMaterial; import ru.betterend.item.material.EndToolMaterial; diff --git a/src/main/java/ru/betterend/world/features/EndLotusLeafFeature.java b/src/main/java/ru/betterend/world/features/EndLotusLeafFeature.java index 116cbbdb..5c12c62e 100644 --- a/src/main/java/ru/betterend/world/features/EndLotusLeafFeature.java +++ b/src/main/java/ru/betterend/world/features/EndLotusLeafFeature.java @@ -8,8 +8,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos.Mutable; import net.minecraft.util.math.Direction; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.EndLotusLeafBlock; import ru.betterend.blocks.BlockProperties.TripleShape; +import ru.betterend.blocks.EndLotusLeafBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; diff --git a/src/main/resources/assets/minecraft/blockstates/chorus_flower.json b/src/main/resources/assets/minecraft/blockstates/custom_chorus_flower.json similarity index 100% rename from src/main/resources/assets/minecraft/blockstates/chorus_flower.json rename to src/main/resources/assets/minecraft/blockstates/custom_chorus_flower.json diff --git a/src/main/resources/assets/minecraft/blockstates/chorus_plant.json b/src/main/resources/assets/minecraft/blockstates/custom_chorus_plant.json similarity index 100% rename from src/main/resources/assets/minecraft/blockstates/chorus_plant.json rename to src/main/resources/assets/minecraft/blockstates/custom_chorus_plant.json diff --git a/src/main/resources/assets/minecraft/models/item/chorus_flower.json b/src/main/resources/assets/minecraft/models/item/custom_chorus_flower.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/chorus_flower.json rename to src/main/resources/assets/minecraft/models/item/custom_chorus_flower.json diff --git a/src/main/resources/assets/minecraft/models/item/chorus_plant.json b/src/main/resources/assets/minecraft/models/item/custom_chorus_plant.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/chorus_plant.json rename to src/main/resources/assets/minecraft/models/item/custom_chorus_plant.json