Skip to content

Commit abe0cb2

Browse files
WaterpickerWaterpicker
committed
Push current stuff due to resetting dev environment
1 parent 21538eb commit abe0cb2

5 files changed

Lines changed: 79 additions & 41 deletions

File tree

‎common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsCore.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ object GenerationsCore {
139139
GenerationsCreativeTabs.init()
140140
GenerationsArmor.init()
141141
GenerationsTools.init()
142-
GenerationsPaintings.init()
143142
GenerationsContainers.init()
144143
RksResultType.init()
145144
GenerationsIngredidents.init()

‎common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/GenerationsPaintings.java‎

Lines changed: 68 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,82 @@
44
import dev.architectury.registry.registries.RegistrySupplier;
55
import generations.gg.generations.core.generationscore.common.GenerationsCore;
66
import net.minecraft.core.registries.Registries;
7+
import net.minecraft.data.worldgen.BootstrapContext;
8+
import net.minecraft.resources.ResourceKey;
79
import net.minecraft.resources.ResourceLocation;
810
import net.minecraft.world.entity.decoration.PaintingVariant;
911

1012
@SuppressWarnings("unused")
1113
public class GenerationsPaintings {
12-
public static final DeferredRegister<PaintingVariant> PAINTINGS = DeferredRegister.create(GenerationsCore.MOD_ID, Registries.PAINTING_VARIANT);
13-
public static RegistrySupplier<PaintingVariant> BLUE_POSTER = register("blue_poster", 64, 64);
14-
public static RegistrySupplier<PaintingVariant> BLUE_POSTER_SPRITE = register("blue_poster_sprite", 16, 16);
15-
public static RegistrySupplier<PaintingVariant> BLUE_SCROLL = register("blue_scroll", 64, 32);
16-
public static RegistrySupplier<PaintingVariant> CLEFAIRY_POSTER_SPRITE = register("clefairy_poster_sprite", 16, 16);
17-
public static RegistrySupplier<PaintingVariant> CUTE_POSTER = register("cute_poster", 64, 64);
18-
public static RegistrySupplier<PaintingVariant> CUTE_POSTER_SPRITE = register("cute_poster_sprite", 16, 16);
19-
public static RegistrySupplier<PaintingVariant> DADS_SCROLL = register("dads_scroll", 64, 32);
20-
public static RegistrySupplier<PaintingVariant> GREEN_POSTER = register("green_poster", 64, 64);
21-
public static RegistrySupplier<PaintingVariant> GREEN_POSTER_SPRITE = register("green_poster_sprite", 16, 16);
22-
public static RegistrySupplier<PaintingVariant> GREEN_SCROLL = register("green_scroll", 64, 32);
23-
public static RegistrySupplier<PaintingVariant> JIGGLYPUFF_POSTER_SPRITE = register("jigglypuff_poster_sprite", 16, 16);
24-
public static RegistrySupplier<PaintingVariant> KISS_POSTER_SPRITE = register("kiss_poster_sprite", 64, 32);
25-
public static RegistrySupplier<PaintingVariant> LONG_POSTER = register("long_poster", 64, 32);
26-
public static RegistrySupplier<PaintingVariant> LONG_POSTER_SPRITE = register("long_poster_sprite", 32, 16);
27-
public static RegistrySupplier<PaintingVariant> NATIONAL_AWARD = register("national_award", 64, 32);
28-
public static RegistrySupplier<PaintingVariant> PIKA_POSTER = register("pika_poster", 64, 32);
29-
public static RegistrySupplier<PaintingVariant> PIKA_POSTER_SPRITE = register("pika_poster_sprite", 32, 16);
30-
public static RegistrySupplier<PaintingVariant> PIKACHU_POSTER_SPRITE = register("pikachu_poster_sprite", 16, 16);
31-
public static RegistrySupplier<PaintingVariant> POKE_BALL_POSTER = register("poke_ball_poster", 64, 64);
32-
public static RegistrySupplier<PaintingVariant> RED_POSTER = register("red_poster", 64, 64);
33-
public static RegistrySupplier<PaintingVariant> RED_POSTER_SPRITE = register("red_poster_sprite", 16, 16);
34-
public static RegistrySupplier<PaintingVariant> RED_SCROLL = register("red_scroll", 64, 32);
35-
public static RegistrySupplier<PaintingVariant> REGIONAL_AWARD = register("regional_award", 64, 32);
36-
public static RegistrySupplier<PaintingVariant> SEA_POSTER = register("sea_poster", 64, 32);
37-
public static RegistrySupplier<PaintingVariant> SEA_POSTER_SPRITE = register("sea_poster_sprite", 32, 16);
38-
public static RegistrySupplier<PaintingVariant> SKY_POSTER = register("sky_poster", 64, 32);
39-
public static RegistrySupplier<PaintingVariant> SKY_POSTER_SPRITE = register("sky_poster_sprite", 32, 16);
40-
public static RegistrySupplier<PaintingVariant> TIME_TRAVEL_AWARD = register("time_travel_award", 64, 32);
41-
public static RegistrySupplier<PaintingVariant> TOWN_MAP_SPRITE = register("town_map_sprite", 16, 16);
14+
public static ResourceKey<PaintingVariant> BLUE_POSTER = create("blue_poster");
15+
public static ResourceKey<PaintingVariant> BLUE_POSTER_SPRITE = create("blue_poster_sprite");
16+
public static ResourceKey<PaintingVariant> BLUE_SCROLL = create("blue_scroll");
17+
public static ResourceKey<PaintingVariant> CLEFAIRY_POSTER_SPRITE = create("clefairy_poster_sprite");
18+
public static ResourceKey<PaintingVariant> CUTE_POSTER = create("cute_poster");
19+
public static ResourceKey<PaintingVariant> CUTE_POSTER_SPRITE = create("cute_poster_sprite");
20+
public static ResourceKey<PaintingVariant> DADS_SCROLL = create("dads_scroll");
21+
public static ResourceKey<PaintingVariant> GREEN_POSTER = create("green_poster");
22+
public static ResourceKey<PaintingVariant> GREEN_POSTER_SPRITE = create("green_poster_sprite");
23+
public static ResourceKey<PaintingVariant> GREEN_SCROLL = create("green_scroll");
24+
public static ResourceKey<PaintingVariant> JIGGLYPUFF_POSTER_SPRITE = create("jigglypuff_poster_sprite");
25+
public static ResourceKey<PaintingVariant> KISS_POSTER_SPRITE = create("kiss_poster_sprite");
26+
public static ResourceKey<PaintingVariant> LONG_POSTER = create("long_poster");
27+
public static ResourceKey<PaintingVariant> LONG_POSTER_SPRITE = create("long_poster_sprite");
28+
public static ResourceKey<PaintingVariant> NATIONAL_AWARD = create("national_award");
29+
public static ResourceKey<PaintingVariant> PIKA_POSTER = create("pika_poster");
30+
public static ResourceKey<PaintingVariant> PIKA_POSTER_SPRITE = create("pika_poster_sprite");
31+
public static ResourceKey<PaintingVariant> PIKACHU_POSTER_SPRITE = create("pikachu_poster_sprite");
32+
public static ResourceKey<PaintingVariant> POKE_BALL_POSTER = create("poke_ball_poster");
33+
public static ResourceKey<PaintingVariant> RED_POSTER = create("red_poster");
4234

43-
private static RegistrySupplier<PaintingVariant> register(String name, int width, int height) {
44-
return PAINTINGS.register(name, () -> new PaintingVariant(width, height, ResourceLocation.parse(""))); //TODO: REminder needed proper path for paintings here. Blank location is tempt
35+
private static ResourceKey<PaintingVariant> create(String name) {
36+
return ResourceKey.create(Registries.PAINTING_VARIANT, GenerationsCore.id(name));
4537
}
4638

47-
public static void init() {
39+
public static ResourceKey<PaintingVariant> RED_POSTER_SPRITE = create("red_poster_sprite");
40+
public static ResourceKey<PaintingVariant> RED_SCROLL = create("red_scroll");
41+
public static ResourceKey<PaintingVariant> REGIONAL_AWARD = create("regional_award");
42+
public static ResourceKey<PaintingVariant> SEA_POSTER = create("sea_poster");
43+
public static ResourceKey<PaintingVariant> SEA_POSTER_SPRITE = create("sea_poster_sprite");
44+
public static ResourceKey<PaintingVariant> SKY_POSTER = create("sky_poster");
45+
public static ResourceKey<PaintingVariant> SKY_POSTER_SPRITE = create("sky_poster_sprite");
46+
public static ResourceKey<PaintingVariant> TIME_TRAVEL_AWARD = create("time_travel_award");
47+
public static ResourceKey<PaintingVariant> TOWN_MAP_SPRITE = create("town_map_sprite");
48+
49+
private static ResourceLocation getDirectory(String name) {
50+
return GenerationsCore.id(name);
51+
}
52+
53+
public static void init(BootstrapContext<PaintingVariant> context) {
4854
GenerationsCore.LOGGER.info("Registering Generations Paintings");
49-
PAINTINGS.register();
55+
context.register(BLUE_POSTER, new PaintingVariant(64, 64, getDirectory("blue_poster")));
56+
context.register(BLUE_POSTER_SPRITE, new PaintingVariant(16, 16, getDirectory("blue_poster_sprite")));
57+
context.register(BLUE_SCROLL, new PaintingVariant(64, 32, getDirectory("blue_scroll")));
58+
context.register(CLEFAIRY_POSTER_SPRITE, new PaintingVariant(16, 16, getDirectory("clefairy_poster_sprite")));
59+
context.register(CUTE_POSTER, new PaintingVariant(64, 64, getDirectory("cute_poster")));
60+
context.register(CUTE_POSTER_SPRITE, new PaintingVariant(16, 16, getDirectory("cute_poster_sprite")));
61+
context.register(DADS_SCROLL, new PaintingVariant(64, 32, getDirectory("dads_scroll")));
62+
context.register(GREEN_POSTER, new PaintingVariant(64, 64, getDirectory("green_poster")));
63+
context.register(GREEN_POSTER_SPRITE, new PaintingVariant(16, 16, getDirectory("green_poster_sprite")));
64+
context.register(GREEN_SCROLL, new PaintingVariant(64, 32, getDirectory("green_scroll")));
65+
context.register(JIGGLYPUFF_POSTER_SPRITE, new PaintingVariant(16, 16, getDirectory("jigglypuff_poster_sprite")));
66+
context.register(KISS_POSTER_SPRITE, new PaintingVariant(64, 32, getDirectory("kiss_poster_sprite")));
67+
context.register(LONG_POSTER, new PaintingVariant(64, 32, getDirectory("long_poster")));
68+
context.register(LONG_POSTER_SPRITE, new PaintingVariant(32, 16, getDirectory("long_poster_sprite")));
69+
context.register(NATIONAL_AWARD, new PaintingVariant(64, 32, getDirectory("national_award")));
70+
context.register(PIKA_POSTER, new PaintingVariant(64, 32, getDirectory("pika_poster")));
71+
context.register(PIKA_POSTER_SPRITE, new PaintingVariant(32, 16, getDirectory("pika_poster_sprite")));
72+
context.register(PIKACHU_POSTER_SPRITE, new PaintingVariant(16, 16, getDirectory("pikachu_poster_sprite")));
73+
context.register(POKE_BALL_POSTER, new PaintingVariant(64, 64, getDirectory("poke_ball_poster")));
74+
context.register(RED_POSTER, new PaintingVariant(64, 64, getDirectory("red_poster")));
75+
context.register(RED_POSTER_SPRITE, new PaintingVariant(16, 16, getDirectory("red_poster_sprite")));
76+
context.register(RED_SCROLL, new PaintingVariant(64, 32, getDirectory("red_scroll")));
77+
context.register(REGIONAL_AWARD, new PaintingVariant(64, 32, getDirectory("regional_award")));
78+
context.register(SEA_POSTER, new PaintingVariant(64, 32, getDirectory("sea_poster")));
79+
context.register(SEA_POSTER_SPRITE, new PaintingVariant(32, 16, getDirectory("sea_poster_sprite")));
80+
context.register(SKY_POSTER, new PaintingVariant(64, 32, getDirectory("sky_poster")));
81+
context.register(SKY_POSTER_SPRITE, new PaintingVariant(32, 16, getDirectory("sky_poster_sprite")));
82+
context.register(TIME_TRAVEL_AWARD, new PaintingVariant(64, 32, getDirectory("time_travel_award")));
83+
context.register(TOWN_MAP_SPRITE, new PaintingVariant(16, 16, getDirectory("town_map_sprite")));
5084
}
5185
}

‎common/src/main/resources/generationscore.accesswidener‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,7 @@ accessible class com/mojang/blaze3d/platform/GlStateManager$BlendState
4444
accessible field com/mojang/blaze3d/platform/GlStateManager$BooleanState enabled Z
4545

4646
extendable class net/minecraft/client/model/geom/ModelPart
47-
accessible field net/minecraft/server/network/ServerCommonPacketListenerImpl connection Lnet/minecraft/network/Connection;
47+
accessible field net/minecraft/server/network/ServerCommonPacketListenerImpl connection Lnet/minecraft/network/Connection;
48+
49+
extendable method net/minecraft/world/entity/LivingEntity getDimensions (Lnet/minecraft/world/entity/Pose;)Lnet/minecraft/world/entity/EntityDimensions;
50+
extendable method net/minecraft/world/entity/LivingEntity canBreatheUnderwater ()Z

‎fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/datagen/DataGen.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package generations.gg.generations.core.generationscore.fabric.datagen
22

33
import generations.gg.generations.core.generationscore.common.world.item.RecordSongs
4+
import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsPaintings
45
import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint
56
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator
67
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput
@@ -19,5 +20,6 @@ class DataGen : DataGeneratorEntrypoint {
1920

2021
override fun buildRegistry(registryBuilder: RegistrySetBuilder) {
2122
registryBuilder.add(Registries.JUKEBOX_SONG, RecordSongs::bootstrap)
23+
registryBuilder.add(Registries.PAINTING_VARIANT, GenerationsPaintings::init)
2224
}
2325
}

‎neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/tags/TagsDatagen.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -716,11 +716,11 @@ object TagsDatagen {
716716
) :
717717
PaintingVariantTagsProvider(arg, completableFuture, GenerationsCore.MOD_ID, existingFileHelper) {
718718
override fun addTags(arg: HolderLookup.Provider) {
719-
GenerationsPaintings.PAINTINGS.forEach(Consumer<RegistrySupplier<PaintingVariant>> { painting: RegistrySupplier<PaintingVariant> ->
720-
tag(
721-
PaintingVariantTags.PLACEABLE
722-
).add(TagEntry.element(painting.id))
723-
})
719+
// GenerationsPaintings.PAINTINGS.forEach(Consumer<RegistrySupplier<PaintingVariant>> { painting: RegistrySupplier<PaintingVariant> -> //TODO: Convert over to the new stuf.
720+
// tag(
721+
// PaintingVariantTags.PLACEABLE
722+
// ).add(TagEntry.element(painting.id))
723+
// })
724724
}
725725
}
726726
}

0 commit comments

Comments
 (0)