Skip to content

Commit 192d86f

Browse files
robotgryphonrobotgryphon
committed
CompactMachines.MOD_ID > Constants
1 parent 14f87bb commit 192d86f

40 files changed

+100
-109
lines changed

‎src/main/java/dev/compactmods/machines/client/ClientEventHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.compactmods.machines.client;
22

3-
import dev.compactmods.machines.CompactMachines;
3+
import dev.compactmods.machines.api.core.Constants;
44
import dev.compactmods.machines.tunnel.Tunnels;
55
import dev.compactmods.machines.core.UIRegistration;
66
import dev.compactmods.machines.room.client.MachineRoomScreen;
@@ -15,7 +15,7 @@
1515
import net.minecraftforge.fml.common.Mod;
1616
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
1717

18-
@Mod.EventBusSubscriber(modid = CompactMachines.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
18+
@Mod.EventBusSubscriber(modid = Constants.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
1919
public class ClientEventHandler {
2020

2121
@SubscribeEvent

‎src/main/java/dev/compactmods/machines/client/Resources.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package dev.compactmods.machines.client;
22

3+
import dev.compactmods.machines.api.core.Constants;
34
import net.minecraft.resources.ResourceLocation;
4-
import dev.compactmods.machines.CompactMachines;
55

66
public class Resources {
77
public static final class Gui {
88
private static final String path = "textures/gui/";
99

10-
public static final ResourceLocation PSD_SCREEN = new ResourceLocation(CompactMachines.MOD_ID, path + "psd_screen.png");
10+
public static final ResourceLocation PSD_SCREEN = new ResourceLocation(Constants.MOD_ID, path + "psd_screen.png");
1111
}
1212
}

‎src/main/java/dev/compactmods/machines/client/gui/PersonalShrinkingDeviceScreen.java‎

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

33
import com.mojang.blaze3d.systems.RenderSystem;
44
import com.mojang.blaze3d.vertex.PoseStack;
5-
import dev.compactmods.machines.CompactMachines;
5+
import dev.compactmods.machines.api.core.Constants;
66
import dev.compactmods.machines.client.gui.guide.GuideSection;
77
import net.minecraft.client.Minecraft;
88
import net.minecraft.client.gui.screens.Screen;
@@ -14,22 +14,22 @@
1414
import java.util.Map;
1515

1616
public class PersonalShrinkingDeviceScreen extends Screen {
17-
private final ResourceLocation GUI = new ResourceLocation(CompactMachines.MOD_ID, "textures/gui/psd_screen.png");
17+
private final ResourceLocation GUI = new ResourceLocation(Constants.MOD_ID, "textures/gui/psd_screen.png");
1818
private static final int WIDTH = 256;
1919
private static final int HEIGHT = 201;
2020

2121
private final Map<ResourceLocation, GuideSection> sections;
22-
private final ResourceLocation emptySection = new ResourceLocation(CompactMachines.MOD_ID, "empty");
22+
private final ResourceLocation emptySection = new ResourceLocation(Constants.MOD_ID, "empty");
2323

2424
@Nullable
2525
private final GuideSection currentSection;
2626

2727
protected PersonalShrinkingDeviceScreen() {
28-
super(Component.translatable(CompactMachines.MOD_ID + ".gui.psd.title"));
28+
super(Component.translatable(Constants.MOD_ID + ".gui.psd.title"));
2929
this.sections = new HashMap<>();
3030

3131
GuideSection root = new GuideSection();
32-
sections.put(new ResourceLocation(CompactMachines.MOD_ID, "root"), root);
32+
sections.put(new ResourceLocation(Constants.MOD_ID, "root"), root);
3333
this.currentSection = root;
3434
}
3535

‎src/main/java/dev/compactmods/machines/client/gui/guide/GuidePage.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.compactmods.machines.client.gui.guide;
22

33
import com.mojang.blaze3d.vertex.PoseStack;
4-
import dev.compactmods.machines.CompactMachines;
4+
import dev.compactmods.machines.api.core.Constants;
55
import dev.compactmods.machines.client.gui.widget.AbstractCMGuiWidget;
66
import dev.compactmods.machines.client.gui.widget.ScrollableWrappedTextWidget;
77
import net.minecraft.ChatFormatting;
@@ -23,15 +23,15 @@ public class GuidePage implements Widget, GuiEventListener {
2323
public GuidePage() {
2424
widgets = new ArrayList<>();
2525

26-
ScrollableWrappedTextWidget sc = new ScrollableWrappedTextWidget(CompactMachines.MOD_ID + ".psd.pages.machines", 2, 18, 222, 160);
26+
ScrollableWrappedTextWidget sc = new ScrollableWrappedTextWidget(Constants.MOD_ID + ".psd.pages.machines", 2, 18, 222, 160);
2727
widgets.add(sc);
2828
}
2929

3030
@Override
3131
public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
3232
Font fr = Minecraft.getInstance().font;
3333
GuiComponent.drawString(ms, fr,
34-
Component.translatable(CompactMachines.MOD_ID + ".psd.pages.machines.title")
34+
Component.translatable(Constants.MOD_ID + ".psd.pages.machines.title")
3535
.withStyle(ChatFormatting.GOLD),
3636
2, 2, 0);
3737

‎src/main/java/dev/compactmods/machines/client/render/RenderTypes.java‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.google.common.collect.ImmutableMap;
44
import com.mojang.blaze3d.vertex.VertexFormat;
55
import com.mojang.blaze3d.vertex.VertexFormatElement;
6-
import dev.compactmods.machines.CompactMachines;
6+
import dev.compactmods.machines.api.core.Constants;
77
import dev.compactmods.machines.client.shader.CM4Shaders;
88
import net.minecraft.client.renderer.RenderStateShard;
99
import net.minecraft.client.renderer.RenderType;
@@ -25,25 +25,10 @@ public class RenderTypes extends RenderStateShard {
2525

2626
protected static final RenderStateShard.LightmapStateShard LIGHTMAP_DISABLED = new RenderStateShard.LightmapStateShard(false);
2727

28-
protected static final RenderStateShard.ShaderStateShard FULLBRIGHT_BLOCKS = new RenderStateShard.ShaderStateShard(CM4Shaders::fullbright);
29-
30-
public static final RenderType TRANSLUCENT_FULLBRIGHT = RenderType.create(
31-
CompactMachines.MOD_ID + ":full_bright",
32-
BLOCK_WITH_OVERLAY, VertexFormat.Mode.QUADS,
33-
256, false, false,
34-
RenderType.CompositeState.builder()
35-
.setShaderState(FULLBRIGHT_BLOCKS)
36-
.setLightmapState(LIGHTMAP_DISABLED)
37-
.setOverlayState(OVERLAY)
38-
.setTextureState(BLOCK_SHEET_MIPPED)
39-
.setTransparencyState(TRANSLUCENT_TRANSPARENCY)
40-
.createCompositeState(false)
41-
);
42-
4328
protected static final RenderStateShard.ShaderStateShard WALL_BLOCKS = new RenderStateShard.ShaderStateShard(CM4Shaders::wall);
4429

4530
public static final RenderType WALLS = RenderType.create(
46-
CompactMachines.MOD_ID + ":wall",
31+
Constants.MOD_ID + ":wall",
4732
BLOCK_WITH_OVERLAY, VertexFormat.Mode.QUADS,
4833
256, false, false,
4934
RenderType.CompositeState.builder()

‎src/main/java/dev/compactmods/machines/client/shader/CM4Shaders.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package dev.compactmods.machines.client.shader;
22

33
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
4-
import dev.compactmods.machines.CompactMachines;
54
import net.minecraft.client.renderer.ShaderInstance;
65
import net.minecraft.resources.ResourceLocation;
76
import net.minecraftforge.api.distmarker.Dist;
@@ -11,7 +10,9 @@
1110

1211
import java.io.IOException;
1312

14-
@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = CompactMachines.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
13+
import static dev.compactmods.machines.api.core.Constants.MOD_ID;
14+
15+
@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
1516
public class CM4Shaders
1617
{
1718
private static ShaderInstance blockFullbrightShader;
@@ -21,12 +22,12 @@ public class CM4Shaders
2122
public static void registerShaders(final RegisterShadersEvent ev) throws IOException
2223
{
2324
ev.registerShader(
24-
new ShaderInstance(ev.getResourceManager(), new ResourceLocation(CompactMachines.MOD_ID, "block_fullbright"), DefaultVertexFormat.BLOCK),
25+
new ShaderInstance(ev.getResourceManager(), new ResourceLocation(MOD_ID, "block_fullbright"), DefaultVertexFormat.BLOCK),
2526
shader -> blockFullbrightShader = shader
2627
);
2728

2829
ev.registerShader(
29-
new ShaderInstance(ev.getResourceManager(), new ResourceLocation(CompactMachines.MOD_ID, "wall"), DefaultVertexFormat.BLOCK),
30+
new ShaderInstance(ev.getResourceManager(), new ResourceLocation(MOD_ID, "wall"), DefaultVertexFormat.BLOCK),
3031
shader -> wallShader = shader
3132
);
3233
}

‎src/main/java/dev/compactmods/machines/command/Commands.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.compactmods.machines.command;
22

33
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
4-
import dev.compactmods.machines.CompactMachines;
4+
import dev.compactmods.machines.api.core.Constants;
55
import dev.compactmods.machines.command.argument.RoomPositionArgument;
66
import dev.compactmods.machines.command.data.CMDataSubcommand;
77
import dev.compactmods.machines.command.subcommand.*;
@@ -15,7 +15,7 @@
1515
import net.minecraftforge.eventbus.api.SubscribeEvent;
1616
import net.minecraftforge.fml.common.Mod;
1717

18-
@Mod.EventBusSubscriber(modid = CompactMachines.MOD_ID)
18+
@Mod.EventBusSubscriber(modid = Constants.MOD_ID)
1919
public class Commands {
2020

2121
// TODO: /cm create <size:RoomSize> <owner:Player> <giveMachine:true|false>
@@ -31,7 +31,7 @@ public class Commands {
3131

3232
@SubscribeEvent
3333
public static void onCommandsRegister(final RegisterCommandsEvent event) {
34-
final LiteralArgumentBuilder<CommandSourceStack> root = LiteralArgumentBuilder.literal(CompactMachines.MOD_ID);
34+
final LiteralArgumentBuilder<CommandSourceStack> root = LiteralArgumentBuilder.literal(Constants.MOD_ID);
3535
root.then(CMEjectSubcommand.make());
3636
root.then(CMSummarySubcommand.make());
3737
root.then(CMRebindSubcommand.make());

‎src/main/java/dev/compactmods/machines/command/data/CMMachineDataExportCommand.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.mojang.brigadier.builder.ArgumentBuilder;
44
import com.mojang.brigadier.context.CommandContext;
55
import dev.compactmods.machines.api.room.MachineRoomConnections;
6+
import dev.compactmods.machines.api.core.Constants;
67
import net.minecraft.commands.CommandSourceStack;
78
import net.minecraft.commands.Commands;
89
import net.minecraft.util.CsvOutput;

‎src/main/java/dev/compactmods/machines/command/data/CMRoomDataExportCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.mojang.brigadier.context.CommandContext;
55
import dev.compactmods.machines.CompactMachines;
66
import dev.compactmods.machines.api.core.CMCommands;
7-
import dev.compactmods.machines.dimension.Dimension;
7+
import dev.compactmods.machines.api.core.Constants;
88
import dev.compactmods.machines.i18n.TranslationUtil;
99
import dev.compactmods.machines.room.data.CompactRoomData;
1010
import net.minecraft.commands.CommandSourceStack;
@@ -33,7 +33,7 @@ private static int execAll(CommandContext<CommandSourceStack> ctx) {
3333

3434
final CompactRoomData rooms = CompactRoomData.get(compact);
3535

36-
var outdir = src.getServer().getFile(CompactMachines.MOD_ID);
36+
var outdir = src.getServer().getFile(Constants.MOD_ID);
3737
var out = outdir.toPath()
3838
.resolve("rooms.csv")
3939
.toAbsolutePath();

‎src/main/java/dev/compactmods/machines/command/data/CMTunnelDataExportCommand.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.mojang.brigadier.exceptions.CommandSyntaxException;
66
import dev.compactmods.machines.CompactMachines;
77
import dev.compactmods.machines.api.core.CMCommands;
8+
import dev.compactmods.machines.api.core.Constants;
89
import dev.compactmods.machines.command.argument.RoomPositionArgument;
910
import dev.compactmods.machines.dimension.MissingDimensionException;
1011
import dev.compactmods.machines.dimension.Dimension;
@@ -43,7 +44,7 @@ private static int execAll(CommandContext<CommandSourceStack> ctx) {
4344

4445
final CompactRoomData rooms = CompactRoomData.get(compact);
4546

46-
var outdir = src.getServer().getFile(CompactMachines.MOD_ID);
47+
var outdir = src.getServer().getFile(Constants.MOD_ID);
4748
var out = outdir.toPath()
4849
.resolve("tunnels.csv")
4950
.toAbsolutePath();
@@ -79,7 +80,7 @@ public static int exec(CommandContext<CommandSourceStack> ctx) throws CommandSyn
7980
final var room = RoomPositionArgument.get(ctx, "room");
8081
final var compactDim = src.getServer().getLevel(Dimension.COMPACT_DIMENSION);
8182

82-
var outdir = src.getServer().getFile(CompactMachines.MOD_ID);
83+
var outdir = src.getServer().getFile(Constants.MOD_ID);
8384
var out = outdir.toPath()
8485
.resolve(String.format("tunnels_%s_%s.csv", room.x, room.z))
8586
.toAbsolutePath();

0 commit comments

Comments
 (0)