Skip to content

Commit c6d7d15

Browse files
PepperCode1PepperCode1
committed
Remap to official names
1 parent c5c94b1 commit c6d7d15

89 files changed

Lines changed: 1084 additions & 1085 deletions

File tree

Some content is hidden

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

‎build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ repositories {
3131
name 'Shedaniel'
3232
url 'https://maven.shedaniel.me'
3333
}
34-
maven {
35-
name 'CaffeineMC'
36-
url 'https://maven.caffeinemc.net/releases'
37-
}
34+
maven {
35+
name 'CaffeineMC'
36+
url 'https://maven.caffeinemc.net/releases'
37+
}
3838
}
3939

4040
dependencies {
4141
// To change the versions see the gradle.properties file
4242
minecraft "com.mojang:minecraft:${project.minecraft_version}"
43-
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
43+
mappings(loom.officialMojangMappings())
4444
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
4545

4646
// Fabric API
@@ -50,8 +50,8 @@ dependencies {
5050
exclude group: 'net.fabricmc.fabric-api'
5151
}
5252

53-
modCompileOnly "net.caffeinemc:sodium-fabric-api:${sodium_version}"
54-
// modRuntimeOnly "net.caffeinemc:sodium-fabric:${sodium_version}"
53+
modCompileOnly "net.caffeinemc:sodium-fabric-api:${sodium_version}"
54+
// modRuntimeOnly "net.caffeinemc:sodium-fabric:${sodium_version}"
5555
}
5656

5757
processResources {

‎gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ org.gradle.parallel = true
55
# Fabric Properties
66
loom_version = 1.14.7
77
minecraft_version = 1.21.11
8-
yarn_mappings = 1.21.11+build.3
98
loader_version = 0.18.3
109

1110
# Mod Properties

‎src/main/java/me/pepperbell/continuity/api/client/CachingPredicates.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import java.util.function.Function;
44

5-
import net.minecraft.block.BlockState;
6-
import net.minecraft.client.texture.Sprite;
7-
import net.minecraft.client.util.SpriteIdentifier;
5+
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
6+
import net.minecraft.client.resources.model.Material;
7+
import net.minecraft.world.level.block.state.BlockState;
88

99
public interface CachingPredicates {
1010
boolean affectsSprites();
1111

12-
boolean affectsSprite(Sprite sprite);
12+
boolean affectsSprite(TextureAtlasSprite sprite);
1313

1414
boolean affectsBlockStates();
1515

@@ -18,6 +18,6 @@ public interface CachingPredicates {
1818
boolean isValidForMultipass();
1919

2020
interface Factory<T extends CtmProperties> {
21-
CachingPredicates createPredicates(T properties, Function<SpriteIdentifier, Sprite> textureGetter);
21+
CachingPredicates createPredicates(T properties, Function<Material, TextureAtlasSprite> spriteGetter);
2222
}
2323
}

‎src/main/java/me/pepperbell/continuity/api/client/CtmProperties.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
import org.jetbrains.annotations.Nullable;
77

8-
import net.minecraft.client.util.SpriteIdentifier;
9-
import net.minecraft.resource.ResourceManager;
10-
import net.minecraft.resource.ResourcePack;
11-
import net.minecraft.util.Identifier;
8+
import net.minecraft.client.resources.model.Material;
9+
import net.minecraft.resources.Identifier;
10+
import net.minecraft.server.packs.PackResources;
11+
import net.minecraft.server.packs.resources.ResourceManager;
1212

1313
public interface CtmProperties extends Comparable<CtmProperties> {
14-
Collection<SpriteIdentifier> getTextureDependencies();
14+
Collection<Material> getTextureDependencies();
1515

1616
interface Factory<T extends CtmProperties> {
1717
@Nullable
18-
T createProperties(Properties properties, Identifier resourceId, ResourcePack pack, int packPriority, ResourceManager resourceManager, String method);
18+
T createProperties(Properties properties, Identifier resourceId, PackResources pack, int packPriority, ResourceManager resourceManager, String method);
1919
}
2020
}

‎src/main/java/me/pepperbell/continuity/api/client/EmissiveSpriteApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.jetbrains.annotations.Nullable;
55

66
import me.pepperbell.continuity.impl.client.EmissiveSpriteApiImpl;
7-
import net.minecraft.client.texture.Sprite;
7+
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
88

99
@ApiStatus.NonExtendable
1010
public interface EmissiveSpriteApi {
@@ -13,5 +13,5 @@ static EmissiveSpriteApi get() {
1313
}
1414

1515
@Nullable
16-
Sprite getEmissiveSprite(Sprite sprite);
16+
TextureAtlasSprite getEmissiveSprite(TextureAtlasSprite sprite);
1717
}

‎src/main/java/me/pepperbell/continuity/api/client/ProcessingDataKey.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.jetbrains.annotations.ApiStatus;
77
import org.jetbrains.annotations.Nullable;
88

9-
import net.minecraft.util.Identifier;
9+
import net.minecraft.resources.Identifier;
1010

1111
@ApiStatus.NonExtendable
1212
public interface ProcessingDataKey<T> {

‎src/main/java/me/pepperbell/continuity/api/client/ProcessingDataKeyRegistry.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.jetbrains.annotations.Nullable;
88

99
import me.pepperbell.continuity.impl.client.ProcessingDataKeyRegistryImpl;
10-
import net.minecraft.util.Identifier;
10+
import net.minecraft.resources.Identifier;
1111

1212
@ApiStatus.NonExtendable
1313
public interface ProcessingDataKeyRegistry {

‎src/main/java/me/pepperbell/continuity/api/client/QuadProcessor.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView;
66
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
7-
import net.minecraft.block.BlockState;
8-
import net.minecraft.client.texture.Sprite;
9-
import net.minecraft.client.util.SpriteIdentifier;
10-
import net.minecraft.util.math.BlockPos;
11-
import net.minecraft.util.math.random.Random;
12-
import net.minecraft.world.BlockRenderView;
7+
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
8+
import net.minecraft.client.resources.model.Material;
9+
import net.minecraft.core.BlockPos;
10+
import net.minecraft.util.RandomSource;
11+
import net.minecraft.world.level.BlockAndTintGetter;
12+
import net.minecraft.world.level.block.state.BlockState;
1313

1414
public interface QuadProcessor {
15-
ProcessingResult processQuad(MutableQuadView quad, Sprite sprite, BlockRenderView blockView, BlockPos pos, BlockState appearanceState, BlockState state, Random random, int pass, ProcessingContext context);
15+
ProcessingResult processQuad(MutableQuadView quad, TextureAtlasSprite sprite, BlockAndTintGetter level, BlockPos pos, BlockState appearanceState, BlockState state, RandomSource random, int pass, ProcessingContext context);
1616

1717
interface ProcessingContext extends ProcessingDataProvider {
1818
QuadEmitter getExtraQuadEmitter();
@@ -26,6 +26,6 @@ enum ProcessingResult {
2626
}
2727

2828
interface Factory<T extends CtmProperties> {
29-
QuadProcessor createProcessor(T properties, Function<SpriteIdentifier, Sprite> textureGetter);
29+
QuadProcessor createProcessor(T properties, Function<Material, TextureAtlasSprite> spriteGetter);
3030
}
3131
}

‎src/main/java/me/pepperbell/continuity/client/ContinuityClient.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
import net.fabricmc.fabric.api.resource.v1.pack.PackActivationType;
4848
import net.fabricmc.fabric.api.resource.v1.reloader.ResourceReloaderKeys;
4949
import net.fabricmc.loader.api.FabricLoader;
50-
import net.minecraft.resource.ResourceType;
51-
import net.minecraft.text.Text;
52-
import net.minecraft.util.Identifier;
50+
import net.minecraft.network.chat.Component;
51+
import net.minecraft.resources.Identifier;
52+
import net.minecraft.server.packs.PackType;
5353

5454
public class ContinuityClient implements ClientModInitializer {
5555
public static final String ID = "continuity";
@@ -63,15 +63,15 @@ public void onInitializeClient() {
6363
ProcessingDataKeys.init();
6464
ModelWrappingHandler.init();
6565

66-
ResourceLoader resourceLoader = ResourceLoader.get(ResourceType.CLIENT_RESOURCES);
66+
ResourceLoader resourceLoader = ResourceLoader.get(PackType.CLIENT_RESOURCES);
6767
resourceLoader.registerReloader(RenderUtil.ReloadListener.ID, RenderUtil.ReloadListener.INSTANCE);
6868
resourceLoader.addReloaderOrdering(ResourceReloaderKeys.Client.ATLAS, RenderUtil.ReloadListener.ID);
6969
resourceLoader.registerReloader(CustomBlockLayers.ReloadListener.ID, CustomBlockLayers.ReloadListener.INSTANCE);
7070
resourceLoader.registerReloader(CtmResourceReloader.ID, CtmResourceReloader.INSTANCE);
7171

7272
FabricLoader.getInstance().getModContainer(ID).ifPresent(container -> {
73-
ResourceLoader.registerBuiltinPack(asId("default"), container, Text.translatable("resourcePack.continuity.default.name"), PackActivationType.NORMAL);
74-
ResourceLoader.registerBuiltinPack(asId("glass_pane_culling_fix"), container, Text.translatable("resourcePack.continuity.glass_pane_culling_fix.name"), PackActivationType.NORMAL);
73+
ResourceLoader.registerBuiltinPack(asId("default"), container, Component.translatable("resourcePack.continuity.default.name"), PackActivationType.NORMAL);
74+
ResourceLoader.registerBuiltinPack(asId("glass_pane_culling_fix"), container, Component.translatable("resourcePack.continuity.glass_pane_culling_fix.name"), PackActivationType.NORMAL);
7575
});
7676

7777
CtmLoaderRegistry registry = CtmLoaderRegistry.get();
@@ -275,6 +275,6 @@ private static <T extends CtmProperties> CtmProperties.Factory<T> wrapWithOptifi
275275
}
276276

277277
public static Identifier asId(String path) {
278-
return Identifier.of(ID, path);
278+
return Identifier.fromNamespaceAndPath(ID, path);
279279
}
280280
}

‎src/main/java/me/pepperbell/continuity/client/config/ContinuityConfigScreen.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
import java.util.List;
66
import java.util.Set;
77

8-
import net.minecraft.client.MinecraftClient;
9-
import net.minecraft.client.gui.DrawContext;
10-
import net.minecraft.client.gui.screen.Screen;
11-
import net.minecraft.client.gui.tooltip.Tooltip;
12-
import net.minecraft.client.gui.widget.ButtonWidget;
13-
import net.minecraft.screen.ScreenTexts;
14-
import net.minecraft.text.Text;
8+
import net.minecraft.client.Minecraft;
9+
import net.minecraft.client.gui.GuiGraphics;
10+
import net.minecraft.client.gui.components.Button;
11+
import net.minecraft.client.gui.components.Tooltip;
12+
import net.minecraft.client.gui.screens.Screen;
13+
import net.minecraft.network.chat.CommonComponents;
14+
import net.minecraft.network.chat.Component;
1515

1616
public class ContinuityConfigScreen extends Screen {
1717
private final Screen parent;
@@ -20,7 +20,7 @@ public class ContinuityConfigScreen extends Screen {
2020
private List<Value<?>> values;
2121

2222
public ContinuityConfigScreen(Screen parent, ContinuityConfig config) {
23-
super(Text.translatable(getTranslationKey("title")));
23+
super(Component.translatable(getTranslationKey("title")));
2424
this.parent = parent;
2525
this.config = config;
2626
}
@@ -33,37 +33,37 @@ protected void init() {
3333

3434
values = List.of(connectedTextures, emissiveTextures, customBlockLayers);
3535

36-
addDrawableChild(startBooleanValueButton(connectedTextures)
37-
.dimensions(width / 2 - 100 - 110, height / 2 - 10 - 12, 200, 20)
36+
addRenderableWidget(startBooleanValueButton(connectedTextures)
37+
.bounds(width / 2 - 100 - 110, height / 2 - 10 - 12, 200, 20)
3838
.build());
39-
addDrawableChild(startBooleanValueButton(emissiveTextures)
40-
.dimensions(width / 2 - 100 + 110, height / 2 - 10 - 12, 200, 20)
39+
addRenderableWidget(startBooleanValueButton(emissiveTextures)
40+
.bounds(width / 2 - 100 + 110, height / 2 - 10 - 12, 200, 20)
4141
.build());
42-
addDrawableChild(startBooleanValueButton(customBlockLayers)
43-
.dimensions(width / 2 - 100 - 110, height / 2 - 10 + 12, 200, 20)
42+
addRenderableWidget(startBooleanValueButton(customBlockLayers)
43+
.bounds(width / 2 - 100 - 110, height / 2 - 10 + 12, 200, 20)
4444
.build());
4545

46-
addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE,
46+
addRenderableWidget(Button.builder(CommonComponents.GUI_DONE,
4747
button -> {
4848
saveValues();
49-
close();
49+
onClose();
5050
})
51-
.dimensions(width / 2 - 75 - 79, height - 40, 150, 20)
51+
.bounds(width / 2 - 75 - 79, height - 40, 150, 20)
5252
.build());
53-
addDrawableChild(ButtonWidget.builder(ScreenTexts.CANCEL, button -> close())
54-
.dimensions(width / 2 - 75 + 79, height - 40, 150, 20)
53+
addRenderableWidget(Button.builder(CommonComponents.GUI_CANCEL, button -> onClose())
54+
.bounds(width / 2 - 75 + 79, height - 40, 150, 20)
5555
.build());
5656
}
5757

5858
@Override
59-
public void render(DrawContext context, int mouseX, int mouseY, float delta) {
59+
public void render(GuiGraphics context, int mouseX, int mouseY, float delta) {
6060
super.render(context, mouseX, mouseY, delta);
61-
context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 30, 0xFFFFFF);
61+
context.drawCenteredString(font, title, width / 2, 30, 0xFFFFFF);
6262
}
6363

6464
@Override
65-
public void close() {
66-
client.setScreen(parent);
65+
public void onClose() {
66+
minecraft.setScreen(parent);
6767
}
6868

6969
private void saveValues() {
@@ -91,22 +91,22 @@ static String getTooltipKey(String translationKey) {
9191
return translationKey + ".tooltip";
9292
}
9393

94-
private ButtonWidget.Builder startBooleanValueButton(Value<Boolean> value) {
94+
private Button.Builder startBooleanValueButton(Value<Boolean> value) {
9595
String translationKey = getTranslationKey(value.getOption().getKey());
96-
Text text = Text.translatable(translationKey);
97-
Text tooltipText = Text.translatable(getTooltipKey(translationKey));
96+
Component component = Component.translatable(translationKey);
97+
Component tooltipComponent = Component.translatable(getTooltipKey(translationKey));
9898

99-
return ButtonWidget.builder(ScreenTexts.composeGenericOptionText(text, ScreenTexts.onOrOff(value.get())),
99+
return Button.builder(CommonComponents.optionNameValue(component, CommonComponents.optionStatus(value.get())),
100100
button -> {
101101
boolean newValue = !value.get();
102102
value.set(newValue);
103-
Text valueText = ScreenTexts.onOrOff(newValue);
103+
Component valueText = CommonComponents.optionStatus(newValue);
104104
if (value.isChanged()) {
105-
valueText = valueText.copy().styled(style -> style.withBold(true));
105+
valueText = valueText.copy().withStyle(style -> style.withBold(true));
106106
}
107-
button.setMessage(ScreenTexts.composeGenericOptionText(text, valueText));
107+
button.setMessage(CommonComponents.optionNameValue(component, valueText));
108108
})
109-
.tooltip(Tooltip.of(tooltipText));
109+
.tooltip(Tooltip.create(tooltipComponent));
110110
}
111111

112112
private static class Value<T> {
@@ -156,7 +156,7 @@ public enum Flag {
156156
RELOAD_WORLD_RENDERER {
157157
@Override
158158
public void onSave() {
159-
MinecraftClient.getInstance().worldRenderer.reload();
159+
Minecraft.getInstance().levelRenderer.allChanged();
160160
}
161161
};
162162

0 commit comments

Comments
 (0)