From bd8ce05831d31cb0f3af56c7ce5ea33933aae505 Mon Sep 17 00:00:00 2001 From: Hubry Date: Thu, 22 Aug 2019 00:30:44 +0200 Subject: [PATCH] Various 1.14 work (#2955) * Fix GoG islands appearing below world height * Fix tallgrass being used instead of grass blocks * Hook up flower worldgen again * Fix index bookmark deserializ., remove debug, use nondeprecated method * Backward compat for headflowers * Sort recipes by input item order --- .../handler/ContributorFancinessHandler.java | 34 ++++++++++++--- .../client/gui/lexicon/GuiLexiconIndex.java | 5 +++ .../runicaltar/RunicAltarRecipeCategory.java | 1 - .../java/vazkii/botania/common/Botania.java | 29 ++----------- .../functional/SubTileAgricarnation.java | 2 +- .../botania/common/item/ItemGrassSeeds.java | 6 +-- .../tool/manasteel/ItemManasteelShovel.java | 2 +- .../lexicon/page/PageCraftingRecipe.java | 15 +++++++ .../common/lexicon/page/PageElvenRecipe.java | 16 +++++++ .../lexicon/page/PageManaInfusionRecipe.java | 15 +++++++ .../common/lexicon/page/PageModRecipe.java | 15 +++++++ .../botania/common/world/ModFeatures.java | 43 +++++++++++++++++++ .../common/world/MysticalFlowerConfig.java | 4 ++ .../common/world/MysticalFlowerFeature.java | 10 ++--- .../common/world/SkyblockWorldEvents.java | 21 +++++---- .../data/botania/recipes/world_seed.json | 2 +- .../botania/tags/blocks/pebble_sources.json | 2 +- 17 files changed, 167 insertions(+), 55 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/world/ModFeatures.java diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 08eae4376..145c573ad 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -10,29 +10,33 @@ */ package vazkii.botania.client.core.handler; -import net.minecraft.client.Minecraft; +import com.google.common.collect.ImmutableMap; import com.mojang.blaze3d.platform.GlStateManager; +import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.AbstractClientPlayerEntity; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.IEntityRenderer; import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.entity.model.PlayerModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerModelPart; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.DyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.Tag; +import net.minecraft.util.DefaultUncaughtExceptionHandler; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -40,6 +44,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import java.util.Properties; @@ -48,6 +53,16 @@ public final class ContributorFancinessHandler extends LayerRenderer flowerMap = new HashMap<>(); private static boolean startedLoading = false; + private static final Tag FLOWERS = new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "special_flowers")); + private static final ImmutableMap LEGACY_FLOWER_NAMES = ImmutableMap.builder() + .put("puredaisy", LibBlockNames.SUBTILE_PUREDAISY.getPath()) + .put("fallenkanade", LibBlockNames.SUBTILE_FALLEN_KANADE.getPath()) + .put("heiseidream", LibBlockNames.SUBTILE_HEISEI_DREAM.getPath()) + .put("arcanerose", LibBlockNames.SUBTILE_ARCANE_ROSE.getPath()) + .put("jadedamaranthus", LibBlockNames.SUBTILE_JADED_AMARANTHUS.getPath()) + .put("orechidignem", LibBlockNames.SUBTILE_ORECHID_IGNEM.getPath()) + .build(); + public ContributorFancinessHandler(IEntityRenderer> renderer) { super(renderer); } @@ -99,9 +114,13 @@ public final class ContributorFancinessHandler extends LayerRenderer= 16) throw new NumberFormatException(); flowerMap.put(key, new ItemStack(ModBlocks.getFlower(DyeColor.byId(i)))); - } catch(NumberFormatException e) { - // todo 1.13 backward compat for camelCase names - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(LibMisc.MOD_ID, value)); + } catch (NumberFormatException e) { + String rawName = value.toLowerCase(Locale.ROOT); + String flowerName = LEGACY_FLOWER_NAMES.getOrDefault(rawName, rawName); + + Item item = FLOWERS.getAllElements().stream() + .filter(flower -> flower.getRegistryName().getPath().equals(flowerName)) + .findFirst().orElse(Items.POPPY); flowerMap.put(key, new ItemStack(item)); } } @@ -144,6 +163,7 @@ public final class ContributorFancinessHandler extends LayerRenderer { + Item output1 = r1.getRecipeOutput().getItem(); + Item output2 = r2.getRecipeOutput().getItem(); + if(output1 == output2) + return 0; + for(Item outputItem : outputItems) { + if(outputItem == output1) { + return -1; + } else if(outputItem == output2) { + return 1; + } + } + return 0; + }); } return list; } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index 103d22f98..8a465f0af 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -140,6 +140,22 @@ public class PageElvenRecipe extends PageRecipe { if(list.isEmpty()) { Botania.LOGGER.warn("Could not find elven trade recipes for item {}, using dummy", (Object) outputItems); return DUMMY; + } else { + list.sort((r1, r2) -> { + for(Item outputItem : outputItems) { + for(ItemStack stack : r1.getOutputs()) { + if(stack.getItem() == outputItem) { + return -1; + } + } + for(ItemStack stack : r2.getOutputs()) { + if(stack.getItem() == outputItem) { + return 1; + } + } + } + return 0; + }); } return list; } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index cf6b01705..6269a3a7f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -191,6 +191,21 @@ public class PageManaInfusionRecipe extends PageRecipe { if(list.isEmpty()) { Botania.LOGGER.warn("Could not find mana infusion recipes for items {}, using dummy", (Object) outputItems); return DUMMY; + } else { + list.sort((r1, r2) -> { + Item output1 = r1.getOutput().getItem(); + Item output2 = r2.getOutput().getItem(); + if(output1 == output2) + return 0; + for(Item outputItem : outputItems) { + if(outputItem == output1) { + return -1; + } else if(outputItem == output2) { + return 1; + } + } + return 0; + }); } return list; } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageModRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageModRecipe.java index a9cb5a12a..79daa77d9 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageModRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageModRecipe.java @@ -168,6 +168,21 @@ public abstract class PageModRecipe extends PageRecipe { } } recipes = list; + + list.sort((r1, r2) -> { + Item output1 = r1.getOutput().getItem(); + Item output2 = r2.getOutput().getItem(); + if(output1 == output2) + return 0; + for(Item outputItem : outputItems) { + if(outputItem == output1) { + return -1; + } else if(outputItem == output2) { + return 1; + } + } + return 0; + }); return list; } return recipes; diff --git a/src/main/java/vazkii/botania/common/world/ModFeatures.java b/src/main/java/vazkii/botania/common/world/ModFeatures.java new file mode 100644 index 000000000..dfb8fd5c7 --- /dev/null +++ b/src/main/java/vazkii/botania/common/world/ModFeatures.java @@ -0,0 +1,43 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [sie 16 2019, 19:17] + */ +package vazkii.botania.common.world; + +import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.GenerationStage; +import net.minecraft.world.gen.feature.Feature; +import net.minecraft.world.gen.placement.IPlacementConfig; +import net.minecraft.world.gen.placement.Placement; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.IForgeRegistry; +import vazkii.botania.common.lib.LibMisc; + +import static vazkii.botania.common.block.ModBlocks.register; + +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class ModFeatures { + public static final Feature MYSTICAL_FLOWERS = new MysticalFlowerFeature(MysticalFlowerConfig::deserialize); + + @SubscribeEvent + public static void registerFeatures(RegistryEvent.Register> event) { + IForgeRegistry> r = event.getRegistry(); + + register(r, MYSTICAL_FLOWERS, "mystical_flowers"); + } + + public static void addWorldgen() { + for(Biome biome : ForgeRegistries.BIOMES) { //todo should this be more specific? + biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(MYSTICAL_FLOWERS, new MysticalFlowerConfig(), Placement.NOPE, IPlacementConfig.NO_PLACEMENT_CONFIG)); + } + } +} diff --git a/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java b/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java index 231082b8d..1ec24499a 100644 --- a/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java +++ b/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java @@ -38,4 +38,8 @@ public class MysticalFlowerConfig implements IFeatureConfig { // todo 1.14 return new Dynamic<>(ops); } + + public static MysticalFlowerConfig deserialize(Dynamic dynamic) { + return new MysticalFlowerConfig(); + } } diff --git a/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java b/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java index 25019f8ea..e83fcbc91 100644 --- a/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java +++ b/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java @@ -2,16 +2,14 @@ package vazkii.botania.common.world; import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; -import net.minecraft.block.DoublePlantBlock; import net.minecraft.block.BlockState; +import net.minecraft.block.DoublePlantBlock; import net.minecraft.item.DyeColor; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.Heightmap; -import net.minecraft.world.gen.GenerationSettings; -import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.feature.Feature; import vazkii.botania.api.item.IFlowerlessBiome; import vazkii.botania.api.item.IFlowerlessWorld; @@ -41,9 +39,9 @@ public class MysticalFlowerFeature extends Feature { int dist = Math.min(8, Math.max(1, config.getPatchSize())); for(int i = 0; i < config.getPatchCount(); i++) { if(rand.nextInt(config.getPatchChance()) == 0) { - int x = pos.getX() + rand.nextInt(16) + 8; - int z = pos.getZ() + rand.nextInt(16) + 8; - int y = world.getHeight(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, pos).getY(); + int x = pos.getX() + rand.nextInt(16); + int z = pos.getZ() + rand.nextInt(16); + int y = world.getHeight(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, x, z); DyeColor color = DyeColor.byId(rand.nextInt(16)); BlockState flower = ModBlocks.getFlower(color).getDefaultState(); diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index cd0045e8f..0558f0f77 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -70,6 +70,10 @@ public final class SkyblockWorldEvents { World world = player.world; if(WorldTypeSkyblock.isWorldSkyblock(world)) { BlockPos coords = world.getSpawnPoint(); + if(coords.getY() <= 0) { + coords = new BlockPos(coords.getX(), 64, coords.getZ()); + world.setSpawnPoint(coords); + } if(world.getBlockState(coords.down(4)).getBlock() != Blocks.BEDROCK && world == overworld) spawnPlayer(player, coords, false); } @@ -84,10 +88,11 @@ public final class SkyblockWorldEvents { public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { if(Botania.gardenOfGlassLoaded) { ItemStack equipped = event.getItemStack(); - if(equipped.isEmpty() && event.getEntityPlayer().isSneaking()) { + PlayerEntity player = event.getPlayer(); + + if(equipped.isEmpty() && player.isSneaking()) { BlockState state = event.getWorld().getBlockState(event.getPos()); Block block = state.getBlock(); - PlayerEntity player = event.getEntityPlayer(); if(PEBBLE_SOURCES.contains(block)) { SoundType st = state.getSoundType(event.getWorld(), event.getPos(), player); @@ -96,23 +101,23 @@ public final class SkyblockWorldEvents { if(event.getWorld().isRemote) player.swingArm(event.getHand()); else if(Math.random() < 0.8) - event.getEntityPlayer().dropItem(new ItemStack(ModItems.pebble), false); + player.dropItem(new ItemStack(ModItems.pebble), false); event.setCanceled(true); event.setCancellationResult(ActionResultType.SUCCESS); } } else if(!equipped.isEmpty() && equipped.getItem() == Items.BOWL) { - RayTraceResult rtr = ToolCommons.raytraceFromEntity(event.getWorld(), event.getEntityPlayer(), + BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(event.getWorld(), player, RayTraceContext.FluidMode.SOURCE_ONLY, 4.5F); if(rtr.getType() == RayTraceResult.Type.BLOCK) { - BlockPos pos = ((BlockRayTraceResult) rtr).getPos(); + BlockPos pos = rtr.getPos(); if(event.getWorld().getBlockState(pos).getMaterial() == Material.WATER) { if(!event.getWorld().isRemote) { equipped.shrink(1); if(equipped.isEmpty()) - event.getEntityPlayer().setHeldItem(event.getHand(), new ItemStack(ModItems.waterBowl)); - else ItemHandlerHelper.giveItemToPlayer(event.getEntityPlayer(), new ItemStack(ModItems.waterBowl)); + player.setHeldItem(event.getHand(), new ItemStack(ModItems.waterBowl)); + else ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.waterBowl)); } event.setCanceled(true); @@ -180,7 +185,7 @@ public final class SkyblockWorldEvents { for(int i = 0; i < 3; i++) for(int j = 0; j < 4; j++) for(int k = 0; k < 3; k++) - world.setBlockState(pos.add(-1 + i, -1 - j, -1 + k), j == 0 ? Blocks.GRASS.getDefaultState() : Blocks.DIRT.getDefaultState()); + world.setBlockState(pos.add(-1 + i, -1 - j, -1 + k), j == 0 ? Blocks.GRASS_BLOCK.getDefaultState() : Blocks.DIRT.getDefaultState()); world.setBlockState(pos.add(-1, -2, 0), Blocks.WATER.getDefaultState()); world.setBlockState(pos.add(1, 2, 1), ModBlocks.manaFlame.getDefaultState()); ((TileManaFlame) world.getTileEntity(pos.add(1, 2, 1))).setColor(new Color(70 + world.rand.nextInt(185), 70 + world.rand.nextInt(185), 70 + world.rand.nextInt(185)).getRGB()); diff --git a/src/main/resources/data/botania/recipes/world_seed.json b/src/main/resources/data/botania/recipes/world_seed.json index 4588d939e..c0f148b90 100644 --- a/src/main/resources/data/botania/recipes/world_seed.json +++ b/src/main/resources/data/botania/recipes/world_seed.json @@ -17,7 +17,7 @@ "tag": "forge:gems/dragonstone" }, "G": { - "item": "minecraft:grass" + "item": "minecraft:grass_block" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/pebble_sources.json b/src/main/resources/data/botania/tags/blocks/pebble_sources.json index 105fbab29..7041e6ab2 100644 --- a/src/main/resources/data/botania/tags/blocks/pebble_sources.json +++ b/src/main/resources/data/botania/tags/blocks/pebble_sources.json @@ -2,7 +2,7 @@ "__comment": "Blocks in this tag provide pebbles in Garden of Glass mode", "replace": false, "values": [ - "minecraft:grass", + "minecraft:grass_block", "minecraft:dirt", "minecraft:farmland", "minecraft:grass_path",