Skip to content

Commit a03b8d4

Browse files
ExDrillExDrill
committed
Mojang mappings
1 parent f157427 commit a03b8d4

File tree

104 files changed

+2562
-2544
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+2562
-2544
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ repositories {
2121

2222
dependencies {
2323
minecraft "com.mojang:minecraft:${project.minecraft_version}"
24-
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
24+
mappings loom.officialMojangMappings()
2525

2626
// Fabric
2727
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

‎src/main/java/com/teamabode/verdance/Verdance.java‎

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,15 @@
1919
import net.fabricmc.fabric.api.object.builder.v1.trade.TradeOfferHelper;
2020
import net.fabricmc.loader.api.FabricLoader;
2121
import net.fabricmc.loader.api.ModContainer;
22-
import net.minecraft.block.Blocks;
23-
import net.minecraft.block.entity.BlockEntityType;
24-
import net.minecraft.item.ItemGroups;
25-
import net.minecraft.item.Items;
26-
import net.minecraft.registry.RegistryKey;
27-
import net.minecraft.registry.RegistryKeys;
28-
import net.minecraft.structure.pool.FeaturePoolElement;
29-
import net.minecraft.structure.pool.StructurePool;
30-
import net.minecraft.structure.pool.StructurePoolElement;
31-
import net.minecraft.util.Identifier;
32-
import net.minecraft.village.TradeOffers;
33-
import net.minecraft.village.VillagerProfession;
34-
import net.minecraft.world.biome.BiomeKeys;
35-
import net.minecraft.world.gen.surfacebuilder.MaterialRules;
22+
import net.minecraft.resources.ResourceLocation;
23+
import net.minecraft.world.entity.npc.VillagerProfession;
24+
import net.minecraft.world.entity.npc.VillagerTrades;
25+
import net.minecraft.world.item.CreativeModeTabs;
26+
import net.minecraft.world.item.Items;
27+
import net.minecraft.world.level.biome.Biomes;
28+
import net.minecraft.world.level.block.Blocks;
29+
import net.minecraft.world.level.block.entity.BlockEntityType;
30+
import net.minecraft.world.level.levelgen.SurfaceRules;
3631
import org.slf4j.Logger;
3732
import org.slf4j.LoggerFactory;
3833

@@ -89,20 +84,20 @@ public static void registerBlockEntitySupportedBlock() {
8984

9085
public static void registerTrades() {
9186
TradeOfferHelper.registerWanderingTraderOffers(1, itemListings -> {
92-
itemListings.add(new TradeOffers.SellItemFactory(VerdanceItems.CANTALOUPE_SEEDS, 1, 1, 12, 1));
93-
itemListings.add(new TradeOffers.SellItemFactory(VerdanceItems.MULBERRY, 5, 1, 8, 1));
94-
itemListings.add(new TradeOffers.SellItemFactory(VerdanceBlocks.VIOLET, 1, 1, 12, 1));
95-
itemListings.add(new TradeOffers.SellItemFactory(VerdanceBlocks.SHRUB, 1, 1, 12, 1));
96-
itemListings.add(new TradeOffers.SellItemFactory(VerdanceBlocks.YELLOW_FLOWERING_SHRUB, 1, 1, 12, 1));
97-
itemListings.add(new TradeOffers.SellItemFactory(VerdanceBlocks.PINK_FLOWERING_SHRUB, 1, 1, 12, 1));
87+
itemListings.add(new VillagerTrades.ItemsForEmeralds(VerdanceItems.CANTALOUPE_SEEDS, 1, 1, 12, 1));
88+
itemListings.add(new VillagerTrades.ItemsForEmeralds(VerdanceItems.MULBERRY, 5, 1, 8, 1));
89+
itemListings.add(new VillagerTrades.ItemsForEmeralds(VerdanceBlocks.VIOLET, 1, 1, 12, 1));
90+
itemListings.add(new VillagerTrades.ItemsForEmeralds(VerdanceBlocks.SHRUB, 1, 1, 12, 1));
91+
itemListings.add(new VillagerTrades.ItemsForEmeralds(VerdanceBlocks.YELLOW_FLOWERING_SHRUB, 1, 1, 12, 1));
92+
itemListings.add(new VillagerTrades.ItemsForEmeralds(VerdanceBlocks.PINK_FLOWERING_SHRUB, 1, 1, 12, 1));
9893
});
9994
TradeOfferHelper.registerVillagerOffers(VillagerProfession.FARMER, 2, itemListings -> {
100-
itemListings.add(new TradeOffers.BuyItemFactory(VerdanceBlocks.CANTALOUPE, 6, 12, 10));
95+
itemListings.add(new VillagerTrades.EmeraldForItems(VerdanceBlocks.CANTALOUPE, 6, 12, 10));
10196
});
10297
}
10398

10499
public static void registerItemGroupEvents() {
105-
ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS).register(entries -> {
100+
ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.BUILDING_BLOCKS).register(entries -> {
106101
entries.addAfter(
107102
Items.CHERRY_BUTTON,
108103
VerdanceBlocks.MULBERRY_LOG,
@@ -120,15 +115,15 @@ public static void registerItemGroupEvents() {
120115
VerdanceBlocks.MULBERRY_BUTTON
121116
);
122117
});
123-
ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register(entries -> {
118+
ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(entries -> {
124119
entries.addAfter(
125120
Items.CHERRY_CHEST_BOAT,
126121
VerdanceItems.MULBERRY_BOAT,
127122
VerdanceItems.MULBERRY_CHEST_BOAT
128123
);
129124
entries.addBefore(Items.MUSIC_DISC_5, VerdanceItems.MUSIC_DISC_RANGE);
130125
});
131-
ItemGroupEvents.modifyEntriesEvent(ItemGroups.FUNCTIONAL).register(entries -> {
126+
ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.FUNCTIONAL_BLOCKS).register(entries -> {
132127
entries.addAfter(
133128
Items.CHERRY_HANGING_SIGN,
134129
VerdanceItems.MULBERRY_SIGN,
@@ -154,12 +149,12 @@ public static void registerItemGroupEvents() {
154149
VerdanceBlocks.PINK_CUSHION
155150
);
156151
});
157-
ItemGroupEvents.modifyEntriesEvent(ItemGroups.FOOD_AND_DRINK).register(entries -> {
152+
ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.FOOD_AND_DRINKS).register(entries -> {
158153
entries.addAfter(Items.GLOW_BERRIES, VerdanceItems.MULBERRY);
159154
entries.addAfter(Items.MELON_SLICE, VerdanceItems.CANTALOUPE_SLICE, VerdanceItems.GRILLED_CANTALOUPE_SLICE);
160155
entries.addAfter(Items.HONEY_BOTTLE, VerdanceItems.CANTALOUPE_JUICE);
161156
});
162-
ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(entries -> {
157+
ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.NATURAL_BLOCKS).register(entries -> {
163158
entries.addAfter(Blocks.CHERRY_LOG, VerdanceBlocks.MULBERRY_LOG);
164159
entries.addAfter(Items.MELON, VerdanceBlocks.CANTALOUPE);
165160
entries.addAfter(Items.MELON_SEEDS, VerdanceItems.CANTALOUPE_SEEDS);
@@ -170,7 +165,7 @@ public static void registerItemGroupEvents() {
170165

171166
entries.addBefore(Items.DEAD_BUSH, VerdanceBlocks.SHRUB, VerdanceBlocks.YELLOW_FLOWERING_SHRUB, VerdanceBlocks.PINK_FLOWERING_SHRUB);
172167
});
173-
ItemGroupEvents.modifyEntriesEvent(ItemGroups.COLORED_BLOCKS).register(entries -> {
168+
ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COLORED_BLOCKS).register(entries -> {
174169
entries.addAfter(
175170
Items.PINK_TERRACOTTA,
176171
VerdanceBlocks.WHITE_STUCCO,
@@ -258,8 +253,8 @@ public static void registerItemGroupEvents() {
258253
VerdanceBlocks.PINK_CUSHION
259254
);
260255
});
261-
ItemGroupEvents.modifyEntriesEvent(ItemGroups.REDSTONE).register(entries -> entries.addAfter(Blocks.CAULDRON, VerdanceBlocks.WHITE_CUSHION));
262-
ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register(entries -> {
256+
ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.REDSTONE_BLOCKS).register(entries -> entries.addAfter(Blocks.CAULDRON, VerdanceBlocks.WHITE_CUSHION));
257+
ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.INGREDIENTS).register(entries -> {
263258
entries.addBefore(Items.DISC_FRAGMENT_5, VerdanceItems.DISC_FRAGMENT_RANGE);
264259
entries.addBefore(Items.ANGLER_POTTERY_SHERD, VerdanceItems.ABODE_POTTERY_SHERD);
265260
entries.addAfter(Items.FRIEND_POTTERY_SHERD, VerdanceItems.FRILLS_POTTERY_SHERD);
@@ -268,7 +263,7 @@ public static void registerItemGroupEvents() {
268263
entries.addAfter(Items.SNORT_POTTERY_SHERD, VerdanceItems.SPIRIT_POTTERY_SHERD, VerdanceItems.TRAP_POTTERY_SHERD);
269264
entries.addAfter(Items.HOST_ARMOR_TRIM_SMITHING_TEMPLATE, VerdanceItems.COMMUNITY_ARMOR_TRIM_SMITHING_TEMPLATE);
270265
});
271-
ItemGroupEvents.modifyEntriesEvent(ItemGroups.SPAWN_EGGS).register(entries -> {
266+
ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.SPAWN_EGGS).register(entries -> {
272267
entries.addBefore(
273268
Items.SILVERFISH_SPAWN_EGG,
274269
VerdanceItems.SILK_MOTH_SPAWN_EGG,
@@ -278,17 +273,17 @@ public static void registerItemGroupEvents() {
278273
}
279274

280275
public static void registerBiomePlacements() {
281-
BiomePlacement.replaceOverworld(BiomeKeys.CHERRY_GROVE, VerdanceBiomes.MULBERRY_FOREST, VerdanceConfig.MULBERRY_FOREST_PROPORTION.get());
282-
BiomePlacement.replaceOverworld(BiomeKeys.SPARSE_JUNGLE, VerdanceBiomes.SHRUBLANDS, VerdanceConfig.SHRUBLANDS_PROPORTION.get());
276+
BiomePlacement.replaceOverworld(Biomes.CHERRY_GROVE, VerdanceBiomes.MULBERRY_FOREST, VerdanceConfig.MULBERRY_FOREST_PROPORTION.get());
277+
BiomePlacement.replaceOverworld(Biomes.SPARSE_JUNGLE, VerdanceBiomes.SHRUBLANDS, VerdanceConfig.SHRUBLANDS_PROPORTION.get());
283278
}
284279

285280
public static void registerSurfaceRules() {
286-
SurfaceGeneration.addOverworldSurfaceRules(Identifier.ofVanilla("rules/overworld"), MaterialRules.sequence(
281+
SurfaceGeneration.addOverworldSurfaceRules(ResourceLocation.withDefaultNamespace("rules/overworld"), SurfaceRules.sequence(
287282
VerdanceSurfaceRules.shrublands()
288283
));
289284
}
290285

291-
public static Identifier id(String name) {
292-
return Identifier.of(MOD_ID, name);
286+
public static ResourceLocation id(String name) {
287+
return ResourceLocation.fromNamespaceAndPath(MOD_ID, name);
293288
}
294289
}

‎src/main/java/com/teamabode/verdance/client/VerdanceAnimations.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.teamabode.verdance.client;
22

33
import com.teamabode.verdance.Verdance;
4-
import net.minecraft.util.Identifier;
4+
import net.minecraft.resources.ResourceLocation;
55

66
public class VerdanceAnimations {
7-
public static final Identifier SILK_MOTH_IDLE = Verdance.id("silk_moth/idle");
8-
public static final Identifier SILK_MOTH_WALK = Verdance.id("silk_moth/walk");
9-
public static final Identifier SILK_MOTH_FLY = Verdance.id("silk_moth/fly");
7+
public static final ResourceLocation SILK_MOTH_IDLE = Verdance.id("silk_moth/idle");
8+
public static final ResourceLocation SILK_MOTH_WALK = Verdance.id("silk_moth/walk");
9+
public static final ResourceLocation SILK_MOTH_FLY = Verdance.id("silk_moth/fly");
1010

11-
public static final Identifier SILKWORM_MOVE = Verdance.id("silkworm/move");
11+
public static final ResourceLocation SILKWORM_MOVE = Verdance.id("silkworm/move");
1212
}

‎src/main/java/com/teamabode/verdance/client/VerdanceClient.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
1414
import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
1515
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
16-
import net.minecraft.block.BlockState;
17-
import net.minecraft.client.MinecraftClient;
18-
import net.minecraft.client.color.world.BiomeColors;
19-
import net.minecraft.client.render.RenderLayer;
20-
import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
21-
import net.minecraft.client.render.entity.EmptyEntityRenderer;
22-
import net.minecraft.item.BlockItem;
23-
import net.minecraft.world.biome.FoliageColors;
16+
import net.minecraft.client.Minecraft;
17+
import net.minecraft.client.renderer.BiomeColors;
18+
import net.minecraft.client.renderer.RenderType;
19+
import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
20+
import net.minecraft.client.renderer.entity.NoopRenderer;
21+
import net.minecraft.world.item.BlockItem;
22+
import net.minecraft.world.level.FoliageColor;
23+
import net.minecraft.world.level.block.state.BlockState;
2424

2525
public class VerdanceClient implements ClientModInitializer {
2626

@@ -40,36 +40,36 @@ private static void registerModelLayers() {
4040
private static void registerRenderers() {
4141
EntityRendererRegistry.register(VerdanceEntityTypes.SILK_MOTH, SilkMothEntityRenderer::new);
4242
EntityRendererRegistry.register(VerdanceEntityTypes.SILKWORM, SilkwormEntityRenderer::new);
43-
EntityRendererRegistry.register(VerdanceEntityTypes.CUSHION, EmptyEntityRenderer::new);
44-
BlockEntityRendererFactories.register(VerdanceBlockEntityTypes.SILK_COCOON, SilkCocoonBlockEntityRenderer::new);
43+
EntityRendererRegistry.register(VerdanceEntityTypes.CUSHION, NoopRenderer::new);
44+
BlockEntityRenderers.register(VerdanceBlockEntityTypes.SILK_COCOON, SilkCocoonBlockEntityRenderer::new);
4545
}
4646

4747
private static void setRenderTypes() {
48-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.MULBERRY_LEAVES, RenderLayer.getCutoutMipped());
49-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.MULBERRY_SAPLING, RenderLayer.getCutout());
50-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.POTTED_MULBERRY_SAPLING, RenderLayer.getCutout());
51-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.ATTACHED_CANTALOUPE_STEM, RenderLayer.getCutout());
52-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.CANTALOUPE_STEM, RenderLayer.getCutout());
53-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.MULBERRY_DOOR, RenderLayer.getCutout());
54-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.MULBERRY_TRAPDOOR, RenderLayer.getCutout());
55-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.SILKWORM_EGGS, RenderLayer.getCutout());
56-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.SILK_COCOON, RenderLayer.getCutout());
57-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.VIOLET, RenderLayer.getCutout());
58-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.POTTED_VIOLET, RenderLayer.getCutout());
59-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.SHRUB, RenderLayer.getCutout());
60-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.POTTED_SHRUB, RenderLayer.getCutout());
61-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.YELLOW_FLOWERING_SHRUB, RenderLayer.getCutout());
62-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.POTTED_YELLOW_FLOWERING_SHRUB, RenderLayer.getCutout());
63-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.PINK_FLOWERING_SHRUB, RenderLayer.getCutout());
64-
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.POTTED_PINK_FLOWERING_SHRUB, RenderLayer.getCutout());
48+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.MULBERRY_LEAVES, RenderType.cutoutMipped());
49+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.MULBERRY_SAPLING, RenderType.cutout());
50+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.POTTED_MULBERRY_SAPLING, RenderType.cutout());
51+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.ATTACHED_CANTALOUPE_STEM, RenderType.cutout());
52+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.CANTALOUPE_STEM, RenderType.cutout());
53+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.MULBERRY_DOOR, RenderType.cutout());
54+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.MULBERRY_TRAPDOOR, RenderType.cutout());
55+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.SILKWORM_EGGS, RenderType.cutout());
56+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.SILK_COCOON, RenderType.cutout());
57+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.VIOLET, RenderType.cutout());
58+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.POTTED_VIOLET, RenderType.cutout());
59+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.SHRUB, RenderType.cutout());
60+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.POTTED_SHRUB, RenderType.cutout());
61+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.YELLOW_FLOWERING_SHRUB, RenderType.cutout());
62+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.POTTED_YELLOW_FLOWERING_SHRUB, RenderType.cutout());
63+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.PINK_FLOWERING_SHRUB, RenderType.cutout());
64+
BlockRenderLayerMap.INSTANCE.putBlock(VerdanceBlocks.POTTED_PINK_FLOWERING_SHRUB, RenderType.cutout());
6565
}
6666

6767
private static void addColorProviders() {
68-
ColorProviderRegistry.BLOCK.register((state, tintGetter, pos, i) -> tintGetter != null && pos != null ? BiomeColors.getFoliageColor(tintGetter, pos) : FoliageColors.getDefaultColor(), VerdanceBlocks.MULBERRY_LEAVES, VerdanceBlocks.FLOWERING_MULBERRY_LEAVES);
68+
ColorProviderRegistry.BLOCK.register((state, tintGetter, pos, i) -> tintGetter != null && pos != null ? BiomeColors.getAverageFoliageColor(tintGetter, pos) : FoliageColor.getDefaultColor(), VerdanceBlocks.MULBERRY_LEAVES, VerdanceBlocks.FLOWERING_MULBERRY_LEAVES);
6969
ColorProviderRegistry.ITEM.register((stack, i) -> {
70-
BlockState state = ((BlockItem) stack.getItem()).getBlock().getDefaultState();
70+
BlockState state = ((BlockItem) stack.getItem()).getBlock().defaultBlockState();
7171

72-
return MinecraftClient.getInstance().getBlockColors().getColor(state, null, null, i);
72+
return Minecraft.getInstance().getBlockColors().getColor(state, null, null, i);
7373
}, VerdanceBlocks.MULBERRY_LEAVES, VerdanceBlocks.FLOWERING_MULBERRY_LEAVES);
7474
}
7575
}

0 commit comments

Comments
 (0)