diff --git a/changelog.txt b/changelog.txt index da830b3..02bc277 100644 --- a/changelog.txt +++ b/changelog.txt @@ -12,6 +12,10 @@ Version 3.X.0 [*]Changed black stone to be able to spawn nether mobs. [/list] +Version 3.2.2 +- Fixed an issue where villages were not generating properly. +- Fixed an issue where difficulty selection at world creation was not being respected. + Version 3.2.1 - Changed grassy clay to behave like regular grass blocks. It can spread grass, grass can spread to dirt clay blocks, and animals can eat grassy clay. - Changed how grassy clay renders to only render clay in the dirt instead of in the grass as well. diff --git a/gradle.properties b/gradle.properties index e979a49..518f5d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ minecraft_version = 1.5.2 yarn_mappings = 1.5.2+build.202201092137 loader_version = 1.0.0 -mod_version = 3.2.1 +mod_version = 3.2.2 maven_group = betterterrain archives_base_name = Better-Terrain-Addon diff --git a/run/.mixin.out/audit/mixin_implementation_report.txt b/run/.mixin.out/audit/mixin_implementation_report.txt index 9fb3f87..0e0078b 100644 --- a/run/.mixin.out/audit/mixin_implementation_report.txt +++ b/run/.mixin.out/audit/mixin_implementation_report.txt @@ -1 +1 @@ -Mixin Implementation Report generated on 2023-05-12 15:14:07 +Mixin Implementation Report generated on 2023-11-05 21:42:25 diff --git a/run/logs/debug-1.log.gz b/run/logs/debug-1.log.gz index b28781d..b758bb6 100644 Binary files a/run/logs/debug-1.log.gz and b/run/logs/debug-1.log.gz differ diff --git a/run/logs/debug.log b/run/logs/debug.log index fa773ab..3bfb453 100644 --- a/run/logs/debug.log +++ b/run/logs/debug.log @@ -1,68 +1,125 @@ -[15:14:07] [main/INFO] (FabricLoader) Loading for game Minecraft 1.5.2 -[15:14:07] [main/DEBUG] (FabricLoader) Requesting deobfuscation of dev.jar -[15:14:07] [main/DEBUG] (FabricLoader) [Knot] Proposed file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/dev_run/dev.jar to classpath. -[15:14:07] [main/DEBUG] (FabricLoader|EntrypointTransformer) Found game constructor: net.minecraft.client.main.Main -> net.minecraft.client.Minecraft -[15:14:07] [main/DEBUG] (FabricLoader|EntrypointTransformer) Patching game constructor startGame()V -[15:14:07] [main/DEBUG] (FabricLoader|EntrypointTransformer) Run directory field is thought to be net/minecraft/client/Minecraft/mcDataDir -[15:14:07] [main/DEBUG] (FabricLoader|EntrypointTransformer) Applying brand name hook to net/minecraft/client/ClientBrandRetriever::getClientModName -[15:14:07] [main/DEBUG] (FabricLoader|EntrypointTransformer) Applying brand name hook to net/minecraft/server/MinecraftServer::getServerModName -[15:14:07] [main/DEBUG] (FabricLoader|EntrypointTransformer) [EntrypointTransformer] Patched 3 classes. -[15:14:07] [main/DEBUG] (Fabric|Loader) [ClasspathModCandidateFinder] Adding dev classpath directories to classpath. -[15:14:07] [main/DEBUG] (FabricLoader) [Knot] Proposed file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/classes/java/main/ to classpath. -[15:14:07] [main/DEBUG] (Fabric|Loader) [ClasspathModCandidateFinder] Processing /C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/resources/main/ -[15:14:07] [main/DEBUG] (Fabric|Loader) [ClasspathModCandidateFinder] Processing /C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar -[15:14:07] [ForkJoinPool-1-worker-25/DEBUG] (Fabric|Loader) Testing file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/resources/main/ -[15:14:07] [ForkJoinPool-1-worker-18/DEBUG] (Fabric|Loader) Testing file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar -[15:14:07] [ForkJoinPool-1-worker-25/DEBUG] (Fabric|Loader) Adding file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/resources/main/ as ModCandidate{betterterrain@3.2.1} -[15:14:07] [ForkJoinPool-1-worker-18/DEBUG] (Fabric|Loader) Adding file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar as ModCandidate{fabricloader@1.0.0} -[15:14:07] [ForkJoinPool-1-worker-18/DEBUG] (Fabric|Loader) Searching for nested JARs in ModCandidate{fabricloader@1.0.0} -[15:14:07] [ForkJoinPool-1-worker-25/DEBUG] (Fabric|Loader) Searching for nested JARs in ModCandidate{betterterrain@3.2.1} -[15:14:07] [ForkJoinPool-1-worker-18/DEBUG] (Fabric|Loader) file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar -[15:14:07] [ForkJoinPool-1-worker-25/DEBUG] (Fabric|Loader) file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/resources/main/ -[15:14:07] [main/DEBUG] (Fabric|Loader) Mod resolution detection time: 12ms -[15:14:07] [main/DEBUG] (Fabric|Loader) Mod resolution time: 1ms -[15:14:07] [main/INFO] (Fabric|Loader) [FabricLoaderImpl] Loading 4 mods: minecraft@1.5.2, betterterrain@3.2.1, java@8, fabricloader@1.0.0 -[15:14:07] [main/DEBUG] (FabricLoader) [Knot] Proposed file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/resources/main/ to classpath. -[15:14:07] [main/DEBUG] (FabricLoader) Loading mappings took 21 ms -[15:14:07] [main/DEBUG] (mixin) Mixin bootstrap service org.spongepowered.asm.service.mojang.MixinServiceLaunchWrapperBootstrap is not available: LaunchWrapper is not available -[15:14:07] [main/DEBUG] (mixin) Mixin bootstrap service org.spongepowered.asm.service.modlauncher.MixinServiceModLauncherBootstrap is not available: ModLauncher is not available -[15:14:07] [main/DEBUG] (mixin) MixinService [LaunchWrapper] is not valid -[15:14:07] [main/DEBUG] (mixin) MixinService [ModLauncher] is not valid -[15:14:07] [main/DEBUG] (mixin) MixinService [Knot/Fabric] was successfully booted in sun.misc.Launcher$AppClassLoader@266474c2 -[15:14:07] [main/INFO] (mixin) SpongePowered MIXIN Subsystem Version=0.8.2 Source=file:/C:/Users/abiga/.gradle/caches/modules-2/files-2.1/net.fabricmc/sponge-mixin/0.9.2+mixin.0.8.2/12c437eebf031967eaa7daad861e115932772cc7/sponge-mixin-0.9.2+mixin.0.8.2.jar Service=Knot/Fabric Env=CLIENT -[15:14:07] [main/DEBUG] (mixin) Initialising Mixin Platform Manager -[15:14:07] [main/DEBUG] (mixin) Adding mixin platform agents for container ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar) -[15:14:07] [main/DEBUG] (mixin) Instancing new MixinPlatformAgentDefault for ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar) -[15:14:07] [main/DEBUG] (mixin) MixinPlatformAgentDefault accepted container ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar) -[15:14:07] [main/DEBUG] (mixin) Instancing new MixinPlatformAgentDefault for ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar) -[15:14:07] [main/DEBUG] (mixin) MixinPlatformAgentDefault accepted container ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar) -[15:14:07] [main/DEBUG] (mixin) Processing prepare() for PlatformAgent[MixinPlatformAgentDefault:ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar)] -[15:14:07] [main/DEBUG] (mixin) Processing prepare() for PlatformAgent[MixinPlatformAgentDefault:ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar)] -[15:14:07] [main/INFO] (Fabric|MixinBootstrap) Loaded Fabric development mappings for mixin remapper! -[15:14:07] [main/DEBUG] (mixin) Error cleaning class output directory: .mixin.out\class: failed to delete one or more files; see suppressed exceptions for details -[15:14:07] [main/DEBUG] (Fabric|Loader) No subscribers for entrypoint 'preLaunch' -[15:14:07] [main/DEBUG] (mixin) Preparing mixins for MixinEnvironment[DEFAULT] -[15:14:07] [main/DEBUG] (mixin) Selecting config betterterrain.mixins.json -[15:14:07] [main/DEBUG] (mixin) Preparing betterterrain.mixins.json (13) -[15:14:07] [main/DEBUG] (mixin) Registering new injector for @Inject with org.spongepowered.asm.mixin.injection.struct.CallbackInjectionInfo -[15:14:07] [main/DEBUG] (mixin) Registering new injector for @ModifyArg with org.spongepowered.asm.mixin.injection.struct.ModifyArgInjectionInfo -[15:14:07] [main/DEBUG] (mixin) Registering new injector for @ModifyArgs with org.spongepowered.asm.mixin.injection.struct.ModifyArgsInjectionInfo -[15:14:07] [main/DEBUG] (mixin) Registering new injector for @Redirect with org.spongepowered.asm.mixin.injection.struct.RedirectInjectionInfo -[15:14:07] [main/DEBUG] (mixin) Registering new injector for @ModifyVariable with org.spongepowered.asm.mixin.injection.struct.ModifyVariableInjectionInfo -[15:14:07] [main/DEBUG] (mixin) Registering new injector for @ModifyConstant with org.spongepowered.asm.mixin.injection.struct.ModifyConstantInjectionInfo -[15:14:07] [main/DEBUG] (mixin) Mixing GuiScreenAccessor from betterterrain.mixins.json into net.minecraft.src.GuiScreen -[15:14:07] [main/DEBUG] (mixin) Mixing ClayBlockMixin from betterterrain.mixins.json into btw.block.blocks.ClayBlock -[15:14:07] [main/DEBUG] (mixin) Mixing WorldTypeAccessor from betterterrain.mixins.json into net.minecraft.src.WorldType -[15:14:07] [main/DEBUG] (mixin) Mixing WorldTypeMixin from betterterrain.mixins.json into net.minecraft.src.WorldType -[15:14:08] [main/DEBUG] (mixin) Mixing GenLayerAccessor from betterterrain.mixins.json into net.minecraft.src.GenLayer -[15:14:08] [main/DEBUG] (mixin) Mixing NetherGrothSporesItemMixin from betterterrain.mixins.json into btw.item.items.NetherGrothSporesItem -[15:14:08] [main/DEBUG] (mixin) Mixing SoulSandPileItemMixin from betterterrain.mixins.json into btw.item.items.SoulSandPileItem -[15:14:08] [main/DEBUG] (mixin) Mixing BiomeDecoratorAccessor from betterterrain.mixins.json into net.minecraft.src.BiomeDecorator -[15:14:08] [main/DEBUG] (mixin) Mixing StructureScatteredFeatureStartMixin from betterterrain.mixins.json into net.minecraft.src.StructureScatteredFeatureStart -[15:14:08] [Minecraft main thread/DEBUG] (Fabric|Loader) No subscribers for entrypoint 'init' -[15:14:08] [Minecraft main thread/DEBUG] (Fabric|Loader) No subscribers for entrypoint 'client' -[15:14:08] [Minecraft main thread/DEBUG] (Fabric|Loader) No subscribers for entrypoint 'postInit' -[15:14:17] [Minecraft main thread/DEBUG] (mixin) Mixing GuiCreateWorldMixin from betterterrain.mixins.json into net.minecraft.src.GuiCreateWorld -[15:14:21] [Server thread/DEBUG] (mixin) Mixing WorldProviderMixin from betterterrain.mixins.json into net.minecraft.src.WorldProvider -[15:14:21] [Server thread/DEBUG] (mixin) Mixing WorldProviderHellMixin from betterterrain.mixins.json into net.minecraft.src.WorldProviderHell -[15:14:21] [Server thread/DEBUG] (mixin) Mixing WorldProviderEndMixin from betterterrain.mixins.json into net.minecraft.src.WorldProviderEnd +[21:42:24] [main/INFO] (FabricLoader) Loading for game Minecraft 1.5.2 +[21:42:24] [main/DEBUG] (FabricLoader) Requesting deobfuscation of dev.jar +[21:42:24] [main/DEBUG] (FabricLoader) [Knot] Proposed file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/dev_run/dev.jar to classpath. +[21:42:24] [main/DEBUG] (FabricLoader|EntrypointTransformer) Found game constructor: net.minecraft.client.main.Main -> net.minecraft.client.Minecraft +[21:42:24] [main/DEBUG] (FabricLoader|EntrypointTransformer) Patching game constructor startGame()V +[21:42:24] [main/DEBUG] (FabricLoader|EntrypointTransformer) Run directory field is thought to be net/minecraft/client/Minecraft/mcDataDir +[21:42:24] [main/DEBUG] (FabricLoader|EntrypointTransformer) Applying brand name hook to net/minecraft/client/ClientBrandRetriever::getClientModName +[21:42:24] [main/DEBUG] (FabricLoader|EntrypointTransformer) Applying brand name hook to net/minecraft/server/MinecraftServer::getServerModName +[21:42:24] [main/DEBUG] (FabricLoader|EntrypointTransformer) [EntrypointTransformer] Patched 3 classes. +[21:42:24] [main/DEBUG] (Fabric|Loader) [ClasspathModCandidateFinder] Adding dev classpath directories to classpath. +[21:42:24] [main/DEBUG] (FabricLoader) [Knot] Proposed file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/classes/java/main/ to classpath. +[21:42:24] [main/DEBUG] (Fabric|Loader) [ClasspathModCandidateFinder] Processing /C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/resources/main/ +[21:42:24] [main/DEBUG] (Fabric|Loader) [ClasspathModCandidateFinder] Processing /C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar +[21:42:24] [ForkJoinPool-1-worker-25/DEBUG] (Fabric|Loader) Testing file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/resources/main/ +[21:42:24] [ForkJoinPool-1-worker-18/DEBUG] (Fabric|Loader) Testing file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar +[21:42:24] [ForkJoinPool-1-worker-11/DEBUG] (Fabric|Loader) Testing file:/C:/Users/abiga/Documents/Minecraft/mods/Deco-Addon-4.1.0.jar +[21:42:24] [ForkJoinPool-1-worker-25/DEBUG] (Fabric|Loader) Adding file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/resources/main/ as ModCandidate{betterterrain@3.2.1} +[21:42:24] [ForkJoinPool-1-worker-18/DEBUG] (Fabric|Loader) Adding file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar as ModCandidate{fabricloader@1.0.0} +[21:42:24] [ForkJoinPool-1-worker-11/DEBUG] (Fabric|Loader) Adding file:/C:/Users/abiga/Documents/Minecraft/mods/Deco-Addon-4.1.0.jar as ModCandidate{decoaddon@4.1.0} +[21:42:24] [ForkJoinPool-1-worker-11/DEBUG] (Fabric|Loader) Searching for nested JARs in ModCandidate{decoaddon@4.1.0} +[21:42:24] [ForkJoinPool-1-worker-18/DEBUG] (Fabric|Loader) Searching for nested JARs in ModCandidate{fabricloader@1.0.0} +[21:42:24] [ForkJoinPool-1-worker-25/DEBUG] (Fabric|Loader) Searching for nested JARs in ModCandidate{betterterrain@3.2.1} +[21:42:24] [ForkJoinPool-1-worker-18/DEBUG] (Fabric|Loader) file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar +[21:42:24] [ForkJoinPool-1-worker-25/DEBUG] (Fabric|Loader) file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/resources/main/ +[21:42:24] [ForkJoinPool-1-worker-11/DEBUG] (Fabric|Loader) file:/C:/Users/abiga/Documents/Minecraft/mods/Deco-Addon-4.1.0.jar +[21:42:24] [main/DEBUG] (Fabric|Loader) Mod resolution detection time: 14ms +[21:42:24] [main/DEBUG] (Fabric|Loader) Mod resolution time: 2ms +[21:42:24] [main/INFO] (Fabric|Loader) [FabricLoaderImpl] Loading 5 mods: minecraft@1.5.2, betterterrain@3.2.1, java@8, fabricloader@1.0.0, decoaddon@4.1.0 +[21:42:24] [main/DEBUG] (FabricLoader) Loading mappings took 22 ms +[21:42:24] [main/DEBUG] (FabricLoader) [Knot] Proposed jimfs://nestedJarStore/edcaecc0-c2a4-4c04-89bd-661d96ae78fe.jar to classpath. +[21:42:24] [main/DEBUG] (FabricLoader) [Knot] Proposed file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/build/resources/main/ to classpath. +[21:42:24] [main/DEBUG] (mixin) Mixin bootstrap service org.spongepowered.asm.service.mojang.MixinServiceLaunchWrapperBootstrap is not available: LaunchWrapper is not available +[21:42:24] [main/DEBUG] (mixin) Mixin bootstrap service org.spongepowered.asm.service.modlauncher.MixinServiceModLauncherBootstrap is not available: ModLauncher is not available +[21:42:24] [main/DEBUG] (mixin) MixinService [LaunchWrapper] is not valid +[21:42:24] [main/DEBUG] (mixin) MixinService [ModLauncher] is not valid +[21:42:24] [main/DEBUG] (mixin) MixinService [Knot/Fabric] was successfully booted in sun.misc.Launcher$AppClassLoader@266474c2 +[21:42:24] [main/INFO] (mixin) SpongePowered MIXIN Subsystem Version=0.8.2 Source=file:/C:/Users/abiga/.gradle/caches/modules-2/files-2.1/net.fabricmc/sponge-mixin/0.9.2+mixin.0.8.2/12c437eebf031967eaa7daad861e115932772cc7/sponge-mixin-0.9.2+mixin.0.8.2.jar Service=Knot/Fabric Env=CLIENT +[21:42:24] [main/DEBUG] (mixin) Initialising Mixin Platform Manager +[21:42:24] [main/DEBUG] (mixin) Adding mixin platform agents for container ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar) +[21:42:24] [main/DEBUG] (mixin) Instancing new MixinPlatformAgentDefault for ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar) +[21:42:24] [main/DEBUG] (mixin) MixinPlatformAgentDefault accepted container ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar) +[21:42:24] [main/DEBUG] (mixin) Instancing new MixinPlatformAgentDefault for ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar) +[21:42:24] [main/DEBUG] (mixin) MixinPlatformAgentDefault accepted container ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar) +[21:42:24] [main/DEBUG] (mixin) Processing prepare() for PlatformAgent[MixinPlatformAgentDefault:ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar)] +[21:42:24] [main/DEBUG] (mixin) Processing prepare() for PlatformAgent[MixinPlatformAgentDefault:ContainerHandleURI(file:/C:/Users/abiga/Documents/Minecraft%20Modding/Better%20than%20Wolves/Better-terrain-addon/Better-Terrain-Addon/.gradle/loom-cache/remapped_mods/null_unspecified_1_5_2_1_0/io/github/minecraft-cursed-legacy/cursed-fabric-loader/1.0.0/cursed-fabric-loader-1.0.0.jar)] +[21:42:24] [main/INFO] (Fabric|MixinBootstrap) Loaded Fabric development mappings for mixin remapper! +[21:42:25] [main/DEBUG] (mixin) Error cleaning class output directory: .mixin.out\class: failed to delete one or more files; see suppressed exceptions for details +[21:42:25] [main/DEBUG] (Fabric|Loader) No subscribers for entrypoint 'preLaunch' +[21:42:25] [main/DEBUG] (mixin) Preparing mixins for MixinEnvironment[DEFAULT] +[21:42:25] [main/DEBUG] (mixin) Selecting config betterterrain.mixins.json +[21:42:25] [main/DEBUG] (mixin) Selecting config decoaddon.item.mixins.json +[21:42:25] [main/DEBUG] (mixin) Selecting config decoaddon.block.mixins.json +[21:42:25] [main/DEBUG] (mixin) Selecting config decoaddon.entity.mixins.json +[21:42:25] [main/DEBUG] (mixin) Selecting config decoaddon.inventory.mixins.json +[21:42:25] [main/DEBUG] (mixin) Selecting config decoaddon.client.mixins.json +[21:42:25] [main/DEBUG] (mixin) Preparing betterterrain.mixins.json (13) +[21:42:25] [main/DEBUG] (mixin) Preparing decoaddon.item.mixins.json (17) +[21:42:25] [main/DEBUG] (mixin) Preparing decoaddon.block.mixins.json (20) +[21:42:25] [main/DEBUG] (mixin) Preparing decoaddon.entity.mixins.json (3) +[21:42:25] [main/DEBUG] (mixin) Preparing decoaddon.inventory.mixins.json (2) +[21:42:25] [main/WARN] (mixin) @Mixin target net/minecraft/src/SlotRepair is public in decoaddon.inventory.mixins.json:SlotRepairMixin and should be specified in value +[21:42:25] [main/DEBUG] (mixin) Preparing decoaddon.client.mixins.json (0) +[21:42:25] [main/DEBUG] (mixin) Registering new injector for @Inject with org.spongepowered.asm.mixin.injection.struct.CallbackInjectionInfo +[21:42:25] [main/DEBUG] (mixin) Registering new injector for @ModifyArg with org.spongepowered.asm.mixin.injection.struct.ModifyArgInjectionInfo +[21:42:25] [main/DEBUG] (mixin) Registering new injector for @ModifyArgs with org.spongepowered.asm.mixin.injection.struct.ModifyArgsInjectionInfo +[21:42:25] [main/DEBUG] (mixin) Registering new injector for @Redirect with org.spongepowered.asm.mixin.injection.struct.RedirectInjectionInfo +[21:42:25] [main/DEBUG] (mixin) Registering new injector for @ModifyVariable with org.spongepowered.asm.mixin.injection.struct.ModifyVariableInjectionInfo +[21:42:25] [main/DEBUG] (mixin) Registering new injector for @ModifyConstant with org.spongepowered.asm.mixin.injection.struct.ModifyConstantInjectionInfo +[21:42:25] [main/DEBUG] (mixin) Mixing GuiScreenAccessor from betterterrain.mixins.json into net.minecraft.src.GuiScreen +[21:42:25] [main/DEBUG] (mixin) Mixing EntityPlayerSPMixin from decoaddon.entity.mixins.json into net.minecraft.src.EntityPlayerSP +[21:42:25] [main/DEBUG] (mixin) Mixing BlockMixin from decoaddon.block.mixins.json into net.minecraft.src.Block +[21:42:25] [main/DEBUG] (mixin) Mixing StoneBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.StoneBlock +[21:42:25] [main/DEBUG] (mixin) Mixing GrassBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.GrassBlock +[21:42:25] [main/DEBUG] (mixin) Mixing PlanksBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.PlanksBlock +[21:42:25] [main/DEBUG] (mixin) Mixing SandBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.SandBlock +[21:42:25] [main/DEBUG] (mixin) Mixing LogBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.LogBlock +[21:42:25] [main/DEBUG] (mixin) Mixing SandstoneBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.SandstoneBlock +[21:42:25] [main/DEBUG] (mixin) Mixing TallGrassBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.TallGrassBlock +[21:42:25] [main/DEBUG] (mixin) Mixing BookshelfBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.BookshelfBlock +[21:42:25] [main/DEBUG] (mixin) Mixing ObsidianBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.ObsidianBlock +[21:42:25] [main/DEBUG] (mixin) Mixing WoodSlabMixin from decoaddon.block.mixins.json into btw.block.blocks.WoodSlabBlock +[21:42:25] [main/DEBUG] (mixin) Mixing WoodSidingAndCornerBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.WoodSidingAndCornerAndDecorativeBlock +[21:42:25] [main/DEBUG] (mixin) Mixing SidingAndCornerBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.SidingAndCornerBlock +[21:42:25] [main/DEBUG] (mixin) Mixing WoodMouldingBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.WoodMouldingAndDecorativeBlock +[21:42:25] [main/DEBUG] (mixin) Mixing BloodWoodLogMixin from decoaddon.block.mixins.json into btw.block.blocks.BloodWoodLogBlock +[21:42:25] [main/DEBUG] (mixin) Mixing LooseDirtBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.LooseDirtBlock +[21:42:25] [main/DEBUG] (mixin) Mixing WorkStumpBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.WorkStumpBlock +[21:42:25] [main/DEBUG] (mixin) Mixing ClayBlockMixin from betterterrain.mixins.json into btw.block.blocks.ClayBlock +[21:42:25] [main/DEBUG] (mixin) Mixing WorldTypeAccessor from betterterrain.mixins.json into net.minecraft.src.WorldType +[21:42:25] [main/DEBUG] (mixin) Mixing WorldTypeMixin from betterterrain.mixins.json into net.minecraft.src.WorldType +[21:42:25] [main/DEBUG] (mixin) Mixing CocoaPlantBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.CocoaPlantBlock +[21:42:25] [main/DEBUG] (mixin) Mixing PlaceAsBlockItemAccessor from decoaddon.item.mixins.json into btw.item.items.PlaceAsBlockItem +[21:42:25] [main/DEBUG] (mixin) Mixing SignItemMixin from decoaddon.item.mixins.json into btw.item.items.SignItem +[21:42:25] [main/DEBUG] (mixin) Mixing DoorItemMixin from decoaddon.item.mixins.json into btw.item.items.DoorItem +[21:42:25] [main/DEBUG] (mixin) Mixing BookItemMixin from decoaddon.item.mixins.json into btw.item.items.BookItem +[21:42:25] [main/DEBUG] (mixin) Mixing DyeItemMixin from decoaddon.item.mixins.json into btw.item.items.DyeItem +[21:42:25] [main/DEBUG] (mixin) Mixing ShearsItemMixin from decoaddon.item.mixins.json into btw.item.items.ShearsItem +[21:42:25] [main/DEBUG] (mixin) Mixing GenLayerAccessor from betterterrain.mixins.json into net.minecraft.src.GenLayer +[21:42:25] [main/DEBUG] (mixin) Mixing GrassSlabBlockMixin from decoaddon.block.mixins.json into btw.block.blocks.GrassSlabBlock +[21:42:25] [main/DEBUG] (mixin) Mixing LadderBlockFlamingMixin from decoaddon.block.mixins.json into btw.block.blocks.LadderBlockFlaming +[21:42:25] [main/DEBUG] (mixin) Mixing JungleSpiderEntityMixin from decoaddon.entity.mixins.json into btw.entity.mob.JungleSpiderEntity +[21:42:25] [main/DEBUG] (mixin) Mixing SquidEntityMixin from decoaddon.entity.mixins.json into btw.entity.mob.SquidEntity +[21:42:25] [main/DEBUG] (mixin) Mixing LegacySubstitutionBlockItemMixin from decoaddon.item.mixins.json into btw.item.blockitems.legacy.LegacySubstitutionBlockItem +[21:42:25] [main/DEBUG] (mixin) Mixing WoodCornerStubMixin from decoaddon.item.mixins.json into btw.item.blockitems.WoodCornerStubBlockItem +[21:42:25] [main/DEBUG] (mixin) Mixing WoodMouldingDecorativeStubMixin from decoaddon.item.mixins.json into btw.item.blockitems.WoodMouldingDecorativeStubBlockItem +[21:42:25] [main/DEBUG] (mixin) Mixing WoodMouldingStubMixin from decoaddon.item.mixins.json into btw.item.blockitems.WoodMouldingStubBlockItem +[21:42:25] [main/DEBUG] (mixin) Mixing WoodSidingDecorativeStubMixin from decoaddon.item.mixins.json into btw.item.blockitems.WoodSidingDecorativeStubBlockItem +[21:42:25] [main/DEBUG] (mixin) Mixing WoodSidingStubMixin from decoaddon.item.mixins.json into btw.item.blockitems.WoodSidingStubBlockItem +[21:42:25] [main/DEBUG] (mixin) Mixing BarkItemMixin from decoaddon.item.mixins.json into btw.item.items.BarkItem +[21:42:25] [main/DEBUG] (mixin) Mixing CocoaBeanItemMixin from decoaddon.item.mixins.json into btw.item.items.CocoaBeanItem +[21:42:25] [main/DEBUG] (mixin) Mixing NetherGrothSporesItemMixin from betterterrain.mixins.json into btw.item.items.NetherGrothSporesItem +[21:42:25] [main/DEBUG] (mixin) Mixing SandPileItemMixin from decoaddon.item.mixins.json into btw.item.items.SandPileItem +[21:42:25] [main/DEBUG] (mixin) Mixing SoulSandPileItemMixin from betterterrain.mixins.json into btw.item.items.SoulSandPileItem +[21:42:25] [main/DEBUG] (mixin) Mixing StoneBrickItemMixin from decoaddon.item.mixins.json into btw.item.items.StoneBrickItem +[21:42:25] [main/DEBUG] (mixin) Mixing StoneItemMixin from decoaddon.item.mixins.json into btw.item.items.StoneItem +[21:42:26] [main/DEBUG] (mixin) Mixing BiomeDecoratorAccessor from betterterrain.mixins.json into net.minecraft.src.BiomeDecorator +[21:42:26] [main/DEBUG] (mixin) Mixing StructureScatteredFeatureStartMixin from betterterrain.mixins.json into net.minecraft.src.StructureScatteredFeatureStart +[21:42:26] [Minecraft main thread/DEBUG] (Fabric|Loader) No subscribers for entrypoint 'init' +[21:42:26] [Minecraft main thread/DEBUG] (Fabric|Loader) No subscribers for entrypoint 'client' +[21:42:26] [Minecraft main thread/DEBUG] (Fabric|Loader) No subscribers for entrypoint 'postInit' +[21:42:32] [Minecraft main thread/DEBUG] (mixin) Mixing GuiCreateWorldMixin from betterterrain.mixins.json into net.minecraft.src.GuiCreateWorld +[21:42:35] [Server thread/DEBUG] (mixin) Mixing WorldProviderMixin from betterterrain.mixins.json into net.minecraft.src.WorldProvider +[21:42:35] [Server thread/DEBUG] (mixin) Mixing WorldProviderHellMixin from betterterrain.mixins.json into net.minecraft.src.WorldProviderHell +[21:42:35] [Server thread/DEBUG] (mixin) Mixing WorldProviderEndMixin from betterterrain.mixins.json into net.minecraft.src.WorldProviderEnd +[21:42:39] [Server thread/DEBUG] (mixin) Mixing ContainerRepairInvoker from decoaddon.inventory.mixins.json into net.minecraft.src.ContainerRepair diff --git a/run/logs/latest.log b/run/logs/latest.log index e066efd..3d3aa5b 100644 --- a/run/logs/latest.log +++ b/run/logs/latest.log @@ -1,4 +1,5 @@ -[15:14:07] [main/INFO] (FabricLoader) Loading for game Minecraft 1.5.2 -[15:14:07] [main/INFO] (Fabric|Loader) [FabricLoaderImpl] Loading 4 mods: minecraft@1.5.2, betterterrain@3.2.1, java@8, fabricloader@1.0.0 -[15:14:07] [main/INFO] (mixin) SpongePowered MIXIN Subsystem Version=0.8.2 Source=file:/C:/Users/abiga/.gradle/caches/modules-2/files-2.1/net.fabricmc/sponge-mixin/0.9.2+mixin.0.8.2/12c437eebf031967eaa7daad861e115932772cc7/sponge-mixin-0.9.2+mixin.0.8.2.jar Service=Knot/Fabric Env=CLIENT -[15:14:07] [main/INFO] (Fabric|MixinBootstrap) Loaded Fabric development mappings for mixin remapper! +[21:42:24] [main/INFO] (FabricLoader) Loading for game Minecraft 1.5.2 +[21:42:24] [main/INFO] (Fabric|Loader) [FabricLoaderImpl] Loading 5 mods: minecraft@1.5.2, betterterrain@3.2.1, java@8, fabricloader@1.0.0, decoaddon@4.1.0 +[21:42:24] [main/INFO] (mixin) SpongePowered MIXIN Subsystem Version=0.8.2 Source=file:/C:/Users/abiga/.gradle/caches/modules-2/files-2.1/net.fabricmc/sponge-mixin/0.9.2+mixin.0.8.2/12c437eebf031967eaa7daad861e115932772cc7/sponge-mixin-0.9.2+mixin.0.8.2.jar Service=Knot/Fabric Env=CLIENT +[21:42:24] [main/INFO] (Fabric|MixinBootstrap) Loaded Fabric development mappings for mixin remapper! +[21:42:25] [main/WARN] (mixin) @Mixin target net/minecraft/src/SlotRepair is public in decoaddon.inventory.mixins.json:SlotRepairMixin and should be specified in value diff --git a/src/main/java/betterbiomes/BetterBiomesMod.java b/src/main/java/betterbiomes/BetterBiomesMod.java index 5910807..66dca90 100644 --- a/src/main/java/betterbiomes/BetterBiomesMod.java +++ b/src/main/java/betterbiomes/BetterBiomesMod.java @@ -15,9 +15,10 @@ public class BetterBiomesMod extends BTAAddon { public static final AddonVersion V3_1_0 = new AddonVersion(3, 1, 0, getInstance()); public static final AddonVersion V3_2_0 = new AddonVersion(3, 2, 0, getInstance()); public static final AddonVersion V3_2_1 = new AddonVersion(3, 2, 1, getInstance()); + public static final AddonVersion V3_2_2 = new AddonVersion(3, 2, 2, getInstance()); private BetterBiomesMod() { - super("Better Biomes", "betterbiomes", "3.2.1", "BB"); + super("Better Biomes", "betterbiomes", "3.2.2", "BB"); } @Override diff --git a/src/main/java/betterterrain/BTAMod.java b/src/main/java/betterterrain/BTAMod.java index 77206ca..bb49ecf 100644 --- a/src/main/java/betterterrain/BTAMod.java +++ b/src/main/java/betterterrain/BTAMod.java @@ -11,6 +11,8 @@ import btw.block.BTWBlocks; import net.minecraft.src.*; +import java.util.ArrayList; + public class BTAMod extends BTWAddon { private static BTAMod instance; @@ -28,7 +30,7 @@ public class BTAMod extends BTWAddon { public static Material netherSand; private BTAMod() { - super("Better Terrain", "3.2.1", "BTA"); + super("Better Terrain", "3.2.2", "BTA"); this.currentVersion = BTAVersion.fromString(this.getVersionString()); } @@ -44,6 +46,10 @@ public void initialize() { Block.blockNetherQuartz.setBlockMaterial(BTWBlocks.netherRockMaterial); Block.slowSand.setBlockMaterial(netherSand); + MapGenVillage.villageSpawnBiomes = new ArrayList<>(); + MapGenVillage.villageSpawnBiomes.add(BiomeGenBase.plains); + MapGenVillage.villageSpawnBiomes.add(BiomeGenBase.desert); + for (BTWAddon mod : AddonHandler.modList.values()) { if (mod instanceof BTAAddon) { BTAAddon addon = (BTAAddon) mod; diff --git a/src/main/java/betterterrain/BTAVersion.java b/src/main/java/betterterrain/BTAVersion.java index 10d2d51..441a564 100644 --- a/src/main/java/betterterrain/BTAVersion.java +++ b/src/main/java/betterterrain/BTAVersion.java @@ -33,7 +33,8 @@ public enum BTAVersion { V3_1_0(3, 1, 0), V3_2_0(3, 2, 0), - V3_2_1(3, 2, 1); + V3_2_1(3, 2, 1), + V3_2_2(3, 2, 2); private final int major; private final int minor; diff --git a/src/main/java/betterterrain/biome/BTABiome.java b/src/main/java/betterterrain/biome/BTABiome.java index bb4c812..5b244ba 100644 --- a/src/main/java/betterterrain/biome/BTABiome.java +++ b/src/main/java/betterterrain/biome/BTABiome.java @@ -1,9 +1,6 @@ package betterterrain.biome; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Random; +import java.util.*; import java.util.function.ToDoubleFunction; import betterterrain.BTAVersion; @@ -603,7 +600,7 @@ public boolean isBeach() { private boolean canSpawnStronghold = true; public BTABiome setSpawnsVillages(boolean isDesert) { - BTAMapGenVillage.villageSpawnBiomes.add(this); + MapGenVillage.villageSpawnBiomes.add(this); if (isDesert) { ComponentVillageStartPiece.addDesertBiome(this); diff --git a/src/main/java/betterterrain/mixins/StructureVillagePiecesMixin.java b/src/main/java/betterterrain/mixins/StructureVillagePiecesMixin.java new file mode 100644 index 0000000..ea76ea9 --- /dev/null +++ b/src/main/java/betterterrain/mixins/StructureVillagePiecesMixin.java @@ -0,0 +1,103 @@ +package betterterrain.mixins; + +import betterterrain.structure.mapgen.BTAMapGenVillage; +import betterterrain.world.BTAWorldChunkManager; +import net.minecraft.src.*; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +@Mixin(StructureVillagePieces.class) +public abstract class StructureVillagePiecesMixin { + /** + * @author Dawnraider00 / TheLadyDawn + * @reason Changing of conditional statement which would otherwise require complicated mixin in order to preserve determinism in world generation + */ + @Overwrite + private static StructureComponent getNextVillageStructureComponent(ComponentVillageStartPiece componentVillageStartPiece, List list, Random rand, int par3, int par4, int par5, int par6, int par7) { + if (par7 > 50) { + return null; + } else if (Math.abs(par3 - componentVillageStartPiece.getBoundingBox().minX) <= 112 && Math.abs(par5 - componentVillageStartPiece.getBoundingBox().minZ) <= 112) { + ComponentVillage var8 = getNextVillageComponent(componentVillageStartPiece, list, rand, par3, par4, par5, par6, par7 + 1); + + if (var8 != null) { + int var9 = (var8.getBoundingBox().minX + var8.getBoundingBox().maxX) / 2; + int var10 = (var8.getBoundingBox().minZ + var8.getBoundingBox().maxZ) / 2; + int var11 = var8.getBoundingBox().maxX - var8.getBoundingBox().minX; + int var12 = var8.getBoundingBox().maxZ - var8.getBoundingBox().minZ; + int var13 = var11 > var12 ? var11 : var12; + + List villageSpawnBiomesList; + + if (componentVillageStartPiece.getWorldChunkManager() instanceof BTAWorldChunkManager) { + System.out.println("BTAWorld"); + villageSpawnBiomesList = MapGenVillage.villageSpawnBiomes; + } else { + System.out.println("Regular World"); + villageSpawnBiomesList = MapGenVillage.villageSpawnBiomes; + } + + if (componentVillageStartPiece.getWorldChunkManager().areBiomesViable(var9, var10, var13 / 2 + 4, villageSpawnBiomesList)) { + list.add(var8); + componentVillageStartPiece.field_74932_i.add(var8); + return var8; + } + } + + return null; + } else { + return null; + } + } + + /** + * @author Dawnraider00 / TheLadyDawn + * @reason Changing of conditional statement which would otherwise require complicated mixin in order to preserve determinism in world generation + */ + @Overwrite + private static StructureComponent getNextComponentVillagePath(ComponentVillageStartPiece componentVillageStartPiece, List list, Random rand, int par3, int par4, int par5, int par6, int par7) { + if (par7 > 3 + componentVillageStartPiece.terrainType) { + return null; + } else if (Math.abs(par3 - componentVillageStartPiece.getBoundingBox().minX) <= 112 && Math.abs(par5 - componentVillageStartPiece.getBoundingBox().minZ) <= 112) { + StructureBoundingBox var8 = ComponentVillagePathGen.func_74933_a(componentVillageStartPiece, list, rand, par3, par4, par5, par6); + + if (var8 != null && var8.minY > 10) { + ComponentVillagePathGen var9 = new ComponentVillagePathGen(componentVillageStartPiece, par7, rand, var8, par6); + int var10 = (var9.getBoundingBox().minX + var9.getBoundingBox().maxX) / 2; + int var11 = (var9.getBoundingBox().minZ + var9.getBoundingBox().maxZ) / 2; + int var12 = var9.getBoundingBox().maxX - var9.getBoundingBox().minX; + int var13 = var9.getBoundingBox().maxZ - var9.getBoundingBox().minZ; + int var14 = var12 > var13 ? var12 : var13; + + List villageSpawnBiomesList; + + if (componentVillageStartPiece.getWorldChunkManager() instanceof BTAWorldChunkManager) { + System.out.println("BTAWorld"); + villageSpawnBiomesList = MapGenVillage.villageSpawnBiomes; + } else { + System.out.println("Regular World"); + villageSpawnBiomesList = MapGenVillage.villageSpawnBiomes; + } + + if (componentVillageStartPiece.getWorldChunkManager().areBiomesViable(var10, var11, var14 / 2 + 4, villageSpawnBiomesList)) { + list.add(var9); + componentVillageStartPiece.field_74930_j.add(var9); + return var9; + } + } + + return null; + } else { + return null; + } + } + + @Shadow + private static ComponentVillage getNextVillageComponent(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) { + throw new IllegalStateException(); + } +} diff --git a/src/main/java/betterterrain/structure/mapgen/BTAMapGenVillage.java b/src/main/java/betterterrain/structure/mapgen/BTAMapGenVillage.java index 1476904..c2f133f 100644 --- a/src/main/java/betterterrain/structure/mapgen/BTAMapGenVillage.java +++ b/src/main/java/betterterrain/structure/mapgen/BTAMapGenVillage.java @@ -7,8 +7,6 @@ public class BTAMapGenVillage extends BTAMapGenStructure { - public static final ArrayList villageSpawnBiomes = new ArrayList(Arrays.asList(new BiomeGenBase[] {BiomeGenBase.plains, BiomeGenBase.desert})); - /** World terrain type, 0 for normal, 1 for flat map */ private int terrainType; private int field_82665_g; @@ -66,7 +64,7 @@ public boolean canSpawnStructureAtCoords(int par1, int par2) if (var3 == var5 && var4 == var6) { - boolean var8 = this.worldObj.getWorldChunkManager().areBiomesViable(var3 * 16 + 8, var4 * 16 + 8, 0, villageSpawnBiomes); + boolean var8 = this.worldObj.getWorldChunkManager().areBiomesViable(var3 * 16 + 8, var4 * 16 + 8, 0, MapGenVillage.villageSpawnBiomes); if (var8) { diff --git a/src/main/resources/betterterrain.accesswidener b/src/main/resources/betterterrain.accesswidener index 87ddc25..a9138c5 100644 --- a/src/main/resources/betterterrain.accesswidener +++ b/src/main/resources/betterterrain.accesswidener @@ -3,6 +3,9 @@ accessWidener v1 named extendable class net/minecraft/src/WorldType extendable class net/minecraft/src/ComponentScatteredFeature +accessible class net/minecraft/src/ComponentVillage accessible class net/minecraft/src/StructureNetherBridgeStart accessible class net/minecraft/src/StructureStrongholdStart -accessible class net/minecraft/src/StructureVillageStart \ No newline at end of file +accessible class net/minecraft/src/StructureVillageStart + +mutable field net/minecraft/src/MapGenVillage villageSpawnBiomes Ljava.util.List; \ No newline at end of file diff --git a/src/main/resources/betterterrain.mixins.json b/src/main/resources/betterterrain.mixins.json index eae0f6e..3df4392 100644 --- a/src/main/resources/betterterrain.mixins.json +++ b/src/main/resources/betterterrain.mixins.json @@ -4,16 +4,15 @@ "package": "betterterrain.mixins", "compatibilityLevel": "JAVA_8", "mixins": [ + "BiomeDecoratorAccessor", "ClayBlockMixin", + "GenLayerAccessor", "NetherGrothSporesItemMixin", "SoulSandPileItemMixin", - - "BiomeDecoratorAccessor", - "GenLayerAccessor", "StructureScatteredFeatureStartMixin", - "WorldProviderMixin", "WorldProviderEndMixin", "WorldProviderHellMixin", + "WorldProviderMixin", "WorldTypeAccessor", "WorldTypeMixin" ],