Skip to content

Commit 24e014f

Browse files
committed
Update testmod to 1.19.4
1 parent a506f87 commit 24e014f

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/TestBlockItem.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package org.embeddedt.modernfix.testmod;
22

33
import net.minecraft.world.item.BlockItem;
4-
import net.minecraft.world.item.CreativeModeTab;
54
import net.minecraft.world.item.Item;
65

76
public class TestBlockItem extends BlockItem {
8-
private static final Item.Properties PROPERTIES = new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS);
7+
private static final Item.Properties PROPERTIES = new Item.Properties();
98

109
public TestBlockItem(TestBlock block) {
1110
super(block, PROPERTIES);

fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/TestMod.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.google.common.base.Stopwatch;
44
import net.fabricmc.api.ModInitializer;
55
import net.minecraft.core.Registry;
6+
import net.minecraft.core.registries.BuiltInRegistries;
67
import net.minecraft.resources.ResourceLocation;
78
import net.minecraft.world.level.block.Blocks;
89
import net.minecraft.world.level.block.state.BlockState;
@@ -32,9 +33,9 @@ public void onInitialize() {
3233
for(int g = 0; g < NUM_COLORS; g++) {
3334
for(int b = 0; b < NUM_COLORS; b++) {
3435
ResourceLocation name = new ResourceLocation(ID, "wool_" + r + "_" + g + "_" + b);
35-
TestBlock block = Registry.register(Registry.BLOCK, name, new TestBlock());
36+
TestBlock block = Registry.register(BuiltInRegistries.BLOCK, name, new TestBlock());
3637
WOOL_STATES.add(block.defaultBlockState());
37-
Registry.register(Registry.ITEM, name, new TestBlockItem(block));
38+
Registry.register(BuiltInRegistries.ITEM, name, new TestBlockItem(block));
3839
numRegistered++;
3940
if((numRegistered % progressReport) == 0) {
4041
LOGGER.info(String.format("Registering... %.02f%%", ((float)numRegistered)/totalToRegister * 100));

fabric/testmod/src/main/java/org/embeddedt/modernfix/testmod/client/TestModBlockModel.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.embeddedt.modernfix.testmod.client;
22

3-
import com.google.common.collect.ImmutableList;
4-
import com.mojang.datafixers.util.Pair;
53
import net.fabricmc.fabric.api.renderer.v1.Renderer;
64
import net.fabricmc.fabric.api.renderer.v1.RendererAccess;
75
import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh;
@@ -30,7 +28,6 @@
3028
import java.util.Collection;
3129
import java.util.Collections;
3230
import java.util.List;
33-
import java.util.Set;
3431
import java.util.function.Function;
3532
import java.util.function.Supplier;
3633

@@ -109,8 +106,8 @@ public Collection<ResourceLocation> getDependencies() {
109106
}
110107

111108
@Override
112-
public Collection<Material> getMaterials(Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
113-
return ImmutableList.of(BASE_WOOL);
109+
public void resolveParents(Function<ResourceLocation, UnbakedModel> function) {
110+
114111
}
115112

116113
private static int scaleColor(int c) {
@@ -119,7 +116,7 @@ private static int scaleColor(int c) {
119116

120117
@Nullable
121118
@Override
122-
public BakedModel bake(ModelBakery modelBakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState transform, ResourceLocation location) {
119+
public BakedModel bake(ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState state, ResourceLocation location) {
123120
// Build the mesh using the Renderer API
124121
Renderer renderer = RendererAccess.INSTANCE.getRenderer();
125122
MeshBuilder builder = renderer.meshBuilder();

0 commit comments

Comments
 (0)