Skip to content

Commit 738c277

Browse files
robotgryphonrobotgryphon
committed
Split testmod and core, ui
1 parent 42cfe75 commit 738c277

Some content is hidden

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

42 files changed

+312
-410
lines changed

‎buildSrc/build.gradle.kts‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,8 @@ repositories {
2626
includeGroup("net.neoforged")
2727
}
2828
}
29-
30-
maven("https://prmaven.neoforged.net/ModDevGradle/pr118") {
31-
content {
32-
includeModule("net.neoforged.moddev.legacyforge", "net.neoforged.moddev.legacyforge.gradle.plugin")
33-
includeModule("net.neoforged.moddev.repositories", "net.neoforged.moddev.repositories.gradle.plugin")
34-
includeModule("net.neoforged", "moddev-gradle")
35-
includeModule("net.neoforged.moddev", "net.neoforged.moddev.gradle.plugin")
36-
}
37-
}
3829
}
3930

4031
dependencies {
41-
// working against MDG PR build (118)
42-
// https://github.com/neoforged/ModDevGradle/pull/118
43-
implementation("net.neoforged.moddev:net.neoforged.moddev.gradle.plugin:2.0.60-beta-pr-118-legacy")
32+
implementation("net.neoforged.moddev:net.neoforged.moddev.gradle.plugin:2.0.59-beta")
4433
}

‎core/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
plugins {
2+
id("gander-convention")
3+
}

‎core/src/main/java/dev/compactmods/gander/core/Gander.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package dev.compactmods.gander.core;
2+
3+
4+
import net.minecraft.resources.ResourceLocation;
5+
6+
public class Gander {
7+
8+
public static ResourceLocation asResource(String path) {
9+
return new ResourceLocation("gander", path);
10+
}
11+
12+
}

testmod/src/main/java/dev/compactmods/gander/RaytraceHelper.java renamed to core/src/main/java/dev/compactmods/gander/core/utility/RaytraceHelper.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
package dev.compactmods.gander;
1+
package dev.compactmods.gander.core.utility;
22

33
import java.util.Optional;
44

55
import org.joml.Vector3f;
66

7-
import dev.compactmods.gander.utility.VecHelper;
87
import net.minecraft.client.Camera;
98
import net.minecraft.world.level.BlockGetter;
109
import net.minecraft.world.level.ClipContext;
1110
import net.minecraft.world.phys.BlockHitResult;
1211

1312
public class RaytraceHelper {
1413

15-
public Optional<BlockHitResult> rayTraceBlock(BlockGetter blockGetter, Camera camera, Vector3f source, Vector3f target) {
14+
public static Optional<BlockHitResult> rayTraceBlock(BlockGetter blockGetter, Camera camera, Vector3f source, Vector3f target) {
1615
final var cameraLook = new Vector3f(camera.getLookVector());
1716
cameraLook.normalize().mul(-1);
1817

@@ -27,7 +26,7 @@ public Optional<BlockHitResult> rayTraceBlock(BlockGetter blockGetter, Camera ca
2726
return Optional.of(rayTraceBlocks);
2827
}
2928

30-
private Vector3f reverseTransformVec(Vector3f in) {
29+
private static Vector3f reverseTransformVec(Vector3f in) {
3130
// float pt = AnimationTickHolder.getPartialTicks();
3231

3332
Vector3f clone = new Vector3f(in).lerp(new Vector3f(), 0);

testmod/src/main/java/dev/compactmods/gander/utility/VecHelper.java renamed to core/src/main/java/dev/compactmods/gander/core/utility/VecHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.compactmods.gander.utility;
1+
package dev.compactmods.gander.core.utility;
22

33
import net.minecraft.core.Direction.Axis;
44
import net.minecraft.network.FriendlyByteBuf;

‎core/src/main/resources/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
FMLModType: GAMELIBRARY
2+
Automatic-Module-Name: gandercore

‎settings.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ plugins {
55
// include more modules here
66
include("levels")
77
include("rendering")
8+
include("ui")
89

910
// project used for actual testing in dev
1011
// modules are auto hooked into to this project
1112
include("testmod")
1213

1314
rootProject.name = "Gander"
15+
include("core")

‎testmod/build.gradle.kts‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ plugins {
33
}
44

55
// sets up MDG workspace and includes all other gander modules
6+
val gModules = listOf(
7+
project(":core"),
8+
project(":levels"),
9+
project(":rendering"),
10+
project(":ui")
11+
)
612

7-
// 'modules' conflicts in dependencies block
8-
// list containing all of ganders modules
9-
// aka every project other than this one (testmod)
10-
//
11-
// these modules are auto included everywhere needed
12-
// so all thats needed to add a new one is include one in settings.gradle
13-
val gModules = rootProject.childProjects.map { it.value }.filter { it != project }
1413
gModules.map { it.path }.forEach(::evaluationDependsOn)
1514

1615
neoForge {
@@ -44,13 +43,21 @@ neoForge {
4443
}
4544
}
4645

46+
repositories {
47+
exclusiveContent {
48+
forRepository { maven("https://cursemaven.com") }
49+
filter{ includeGroup("curse.maven") }
50+
}
51+
}
52+
4753
dependencies {
4854
gModules.forEach(::implementation)
55+
56+
modImplementation("curse.maven:chicken-chunks-1-8-243883:5292574")
57+
modImplementation("curse.maven:codechicken-lib-1-8-242818:5753868")
4958
}
5059

5160
mixin {
52-
add(sourceSets[SourceSet.MAIN_SOURCE_SET_NAME], "gander.mixins.json")
53-
config("gander.mixins.json")
5461
config("gander_render.mixins.json")
5562
config("gander_levels.mixins.json")
5663
}

‎testmod/src/main/java/dev/compactmods/gander/CommonEvents.java‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

testmod/src/main/java/dev/compactmods/gander/core/GanderCommand.java renamed to testmod/src/main/java/dev/compactmods/gander/GanderCommand.java

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

33
import java.util.Collection;
44
import java.util.Collections;
@@ -10,7 +10,6 @@
1010
import com.mojang.brigadier.context.CommandContext;
1111
import com.mojang.brigadier.suggestion.SuggestionProvider;
1212

13-
import dev.compactmods.gander.GanderLib;
1413
import dev.compactmods.gander.level.VirtualLevel;
1514
import dev.compactmods.gander.level.chunk.VirtualChunkGenerator;
1615
import dev.compactmods.gander.network.OpenGanderUiForDeferredStructureRequest;
@@ -45,13 +44,19 @@
4544
import net.minecraft.world.level.levelgen.structure.StructureCheck;
4645
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
4746
import net.minecraftforge.common.util.FakePlayer;
47+
import net.minecraftforge.event.RegisterCommandsEvent;
4848
import net.minecraftforge.network.PacketDistributor;
4949

5050
public class GanderCommand {
5151
public static final SuggestionProvider<CommandSourceStack> ANY_STRUCTURE = (ctx, builder)
5252
-> SharedSuggestionProvider.suggestResource(ctx.getSource().getServer().getStructureManager().listTemplates(), builder);
5353

54-
public static LiteralArgumentBuilder<CommandSourceStack> make() {
54+
public static void register(RegisterCommandsEvent event) {
55+
var dispatcher = event.getDispatcher();
56+
dispatcher.register(GanderCommand.make());
57+
}
58+
59+
private static LiteralArgumentBuilder<CommandSourceStack> make() {
5560
var root = Commands.literal("gander")
5661
.requires(cs -> cs.hasPermission(0));
5762

@@ -96,7 +101,7 @@ private static int openTemplateScene(ResourceLocation sceneId, Collection<? exte
96101
if (player instanceof FakePlayer)
97102
continue;
98103

99-
GanderLib.CHANNEL.send(PacketDistributor.PLAYER.with(() -> player), new OpenGanderUiForDeferredStructureRequest(sceneId));
104+
GanderTestMod.CHANNEL.send(PacketDistributor.PLAYER.with(() -> player), new OpenGanderUiForDeferredStructureRequest(sceneId));
100105
}
101106

102107
return Command.SINGLE_SUCCESS;
@@ -190,7 +195,7 @@ private static int openStructureScene(CommandContext<CommandSourceStack> ctx, Ho
190195
boundingbox.minZ()
191196
), boundingbox.getLength(), false, Blocks.AIR);
192197

193-
GanderLib.CHANNEL.send(PacketDistributor.PLAYER.with(() -> player), new OpenGanderUiForStructureRequest(Component.literal("Generated: " + key.key().location()), finalStructure));
198+
GanderTestMod.CHANNEL.send(PacketDistributor.PLAYER.with(() -> player), new OpenGanderUiForStructureRequest(Component.literal("Generated: " + key.key().location()), finalStructure));
194199
}
195200

196201
return Command.SINGLE_SUCCESS;
@@ -227,7 +232,7 @@ private static int generateDebug(CommandContext<CommandSourceStack> ctx, Collect
227232
structure.fillFromWorld(level, new BlockPos(0, 60, 0), new Vec3i(maxX, 70, maxZ), false, Blocks.AIR);
228233

229234
var payload = new OpenGanderUiForStructureRequest(Component.literal("Generated: minecraft:debug"), structure);
230-
players.forEach(player -> GanderLib.CHANNEL.send(PacketDistributor.PLAYER.with(() -> player), payload));
235+
players.forEach(player -> GanderTestMod.CHANNEL.send(PacketDistributor.PLAYER.with(() -> player), payload));
231236
return Command.SINGLE_SUCCESS;
232237
}
233238
}

0 commit comments

Comments
 (0)