From 1dfcd8bd169749a4b9d0ea5ceb3c87ff54897bea Mon Sep 17 00:00:00 2001 From: realSquidCoder Date: Sat, 18 Dec 2021 13:44:12 -0600 Subject: [PATCH] Save work --- src/generated/resources/.cache/cache | 2 +- .../squidcoder/models/item/shipwrights_table.json | 3 +++ .../data/squidcoder/recipes/empty_blueprint.json | 2 +- .../data/custom/screens/ShipwrightsTableScreen.java | 12 ++++++++++-- .../setup/world/gen/ModBiomesDatapack.java | 4 +++- .../squidcoder/worldgen/biome/tar_pits_biome.json | 2 +- 6 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 src/generated/resources/assets/squidcoder/models/item/shipwrights_table.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index adb84eb..fba1478 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -107,7 +107,7 @@ e24de9e1fec734c36e4170814c3aea67753dce03 data/squidcoder/loot_tables/blocks/waxe 119f27b37e86c02adf283784bdf37362e86598a1 data/squidcoder/recipes/copper_ingot_from_blasting_raw.json df4f9f9d9cb1c99c8b043fe2dac7f72a42c4a0cd data/squidcoder/recipes/copper_ingot_from_smelting_ore.json 1488572358c4f218c1d547b997d9596ad09bf5f3 data/squidcoder/recipes/copper_ingot_from_smelting_raw.json -f16abb07232c191864e2695ca13eeb9f3c85dd78 data/squidcoder/recipes/empty_blueprint.json +ac16ae706648292abf35049b0afe8886ea2cd2b7 data/squidcoder/recipes/empty_blueprint.json af6b4600489a0207ba89d70b2a22c7f7425b4074 data/squidcoder/recipes/gold_ingot_from_blasting_raw.json ea2151fb457c826a158ed2868202ec2f54b683d0 data/squidcoder/recipes/gold_ingot_from_smelting_raw.json ec22563614ab63fe57970c3768c457fd01352dcb data/squidcoder/recipes/iron_ingot_from_blasting_raw.json diff --git a/src/generated/resources/assets/squidcoder/models/item/shipwrights_table.json b/src/generated/resources/assets/squidcoder/models/item/shipwrights_table.json new file mode 100644 index 0000000..76d41a2 --- /dev/null +++ b/src/generated/resources/assets/squidcoder/models/item/shipwrights_table.json @@ -0,0 +1,3 @@ +{ + "parent": "squidcoder:block/shipwrights_table" +} \ No newline at end of file diff --git a/src/generated/resources/data/squidcoder/recipes/empty_blueprint.json b/src/generated/resources/data/squidcoder/recipes/empty_blueprint.json index 79178c6..900701f 100644 --- a/src/generated/resources/data/squidcoder/recipes/empty_blueprint.json +++ b/src/generated/resources/data/squidcoder/recipes/empty_blueprint.json @@ -10,7 +10,7 @@ "item": "minecraft:paper" }, "o": { - "item": "minecraft:blue_dye" + "item": "minecraft:light_blue_dye" } }, "result": { diff --git a/src/main/java/com/SquidCoder/squidcoder/data/custom/screens/ShipwrightsTableScreen.java b/src/main/java/com/SquidCoder/squidcoder/data/custom/screens/ShipwrightsTableScreen.java index 4a9b112..07dd921 100644 --- a/src/main/java/com/SquidCoder/squidcoder/data/custom/screens/ShipwrightsTableScreen.java +++ b/src/main/java/com/SquidCoder/squidcoder/data/custom/screens/ShipwrightsTableScreen.java @@ -28,8 +28,8 @@ public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partia protected void renderBg(MatrixStack matrixStack, float partialTicks, int x, int y) { RenderSystem.color4f(1f, 1f, 1f, 1f); this.minecraft.getTextureManager().bind(GUI); - int i = this.leftPos; - int j = this.topPos; + int i = (width - imageWidth) / 2; + int j = (height - imageHeight) / 2; this.blit(matrixStack, i, j, 0, 0, this.imageWidth, this.imageHeight); @@ -40,4 +40,12 @@ protected void renderBg(MatrixStack matrixStack, float partialTicks, int x, int } */ } + + @Override + protected void renderLabels(MatrixStack stack, int i, int j) { + int inventoryLabelX = 8; + int inventoryLabelY = this.imageHeight - 94; + this.font.draw(stack, this.inventory.getDisplayName(), (float)inventoryLabelX, (float)inventoryLabelY, 4210752); + super.renderLabels(stack, i, j); + } } \ No newline at end of file diff --git a/src/main/java/com/SquidCoder/squidcoder/setup/world/gen/ModBiomesDatapack.java b/src/main/java/com/SquidCoder/squidcoder/setup/world/gen/ModBiomesDatapack.java index fe23609..f7a830b 100644 --- a/src/main/java/com/SquidCoder/squidcoder/setup/world/gen/ModBiomesDatapack.java +++ b/src/main/java/com/SquidCoder/squidcoder/setup/world/gen/ModBiomesDatapack.java @@ -11,7 +11,8 @@ public class ModBiomesDatapack { - public static RegistryKey LUSH_CAVES_BIOME = registerBiome("amethyst_biome"); + public static RegistryKey LUSH_CAVES_BIOME = registerBiome("lush_caves_biome"); + public static RegistryKey TAR_PITS_BIOME = registerBiome("tar_pits_biome"); public static RegistryKey registerBiome(String biomeName) { Registration.BIOMES.register(biomeName, BiomeMaker::theVoidBiome); @@ -20,5 +21,6 @@ public static RegistryKey registerBiome(String biomeName) { public static void register() { BiomeManager.addBiome(BiomeManager.BiomeType.COOL, new BiomeManager.BiomeEntry(LUSH_CAVES_BIOME, 10)); + BiomeManager.addBiome(BiomeManager.BiomeType.COOL, new BiomeManager.BiomeEntry(TAR_PITS_BIOME, 10)); } } \ No newline at end of file diff --git a/src/main/resources/data/squidcoder/worldgen/biome/tar_pits_biome.json b/src/main/resources/data/squidcoder/worldgen/biome/tar_pits_biome.json index eb3d73a..72dc7ef 100644 --- a/src/main/resources/data/squidcoder/worldgen/biome/tar_pits_biome.json +++ b/src/main/resources/data/squidcoder/worldgen/biome/tar_pits_biome.json @@ -31,7 +31,7 @@ "maxCount": 4 }, { - "type": "squidcoder:tar_slime", + "type": "minecraft:slime", "weight": 100, "minCount": 4, "maxCount": 4