Skip to content

Commit fb0bd93

Browse files
committed
Package migration to dev.compactmods.machines
1 parent 7d6ee17 commit fb0bd93

File tree

115 files changed

+390
-499
lines changed

Some content is hidden

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

115 files changed

+390
-499
lines changed

build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def gitCommitHash = 'git rev-parse --verify --short HEAD'.execute().text.trim()
2222
def isRelease = (System.getenv("CM_RELEASE") ?: "false").equalsIgnoreCase("true")
2323

2424
version = isRelease ? mod_version : "nightly-${gitCommitHash}"
25-
group = 'com.robotgryphon'
25+
group = "dev.compactmods"
2626
archivesBaseName = mod_id
2727

2828
println("Mod ID: ${mod_id}");
@@ -32,9 +32,7 @@ sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = co
3232

3333
sourceSets {
3434
main {
35-
resources {
36-
srcDir 'src/generated/resources'
37-
}
35+
resources.srcDir "src/generated/resources"
3836
}
3937
test
4038
}

src/main/java/com/robotgryphon/compactmachines/api/tunnels/redstone/IRedstoneTunnel.java

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

src/main/java/com/robotgryphon/compactmachines/data/graph/IGraphEdge.java

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

src/main/java/com/robotgryphon/compactmachines/data/player/IPlayerHistoryNode.java

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

src/main/java/com/robotgryphon/compactmachines/rooms/IRoomHistoryItem.java

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

src/main/java/com/robotgryphon/compactmachines/CompactMachines.java renamed to src/main/java/dev/compactmods/machines/CompactMachines.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,17 @@
1-
package com.robotgryphon.compactmachines;
1+
package dev.compactmods.machines;
22

3-
import com.robotgryphon.compactmachines.compat.theoneprobe.TheOneProbeCompat;
4-
import com.robotgryphon.compactmachines.config.CommonConfig;
5-
import com.robotgryphon.compactmachines.config.EnableVanillaRecipesConfigCondition;
6-
import com.robotgryphon.compactmachines.config.ServerConfig;
7-
import com.robotgryphon.compactmachines.core.Registration;
8-
import com.robotgryphon.compactmachines.network.NetworkHandler;
9-
import net.minecraft.client.Minecraft;
3+
import dev.compactmods.machines.config.CommonConfig;
4+
import dev.compactmods.machines.config.EnableVanillaRecipesConfigCondition;
5+
import dev.compactmods.machines.config.ServerConfig;
6+
import dev.compactmods.machines.core.Registration;
107
import net.minecraft.item.ItemGroup;
118
import net.minecraft.item.ItemStack;
12-
import net.minecraftforge.common.MinecraftForge;
139
import net.minecraftforge.common.crafting.CraftingHelper;
1410
import net.minecraftforge.event.TickEvent;
15-
import net.minecraftforge.eventbus.api.IEventBus;
1611
import net.minecraftforge.eventbus.api.SubscribeEvent;
17-
import net.minecraftforge.fml.ModList;
1812
import net.minecraftforge.fml.ModLoadingContext;
1913
import net.minecraftforge.fml.common.Mod;
20-
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
2114
import net.minecraftforge.fml.config.ModConfig;
22-
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
23-
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
24-
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
25-
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
2615
import org.apache.logging.log4j.LogManager;
2716
import org.apache.logging.log4j.Logger;
2817

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

3-
import com.robotgryphon.compactmachines.advancement.trigger.HowDidYouGetHereTrigger;
3+
import dev.compactmods.machines.advancement.trigger.HowDidYouGetHereTrigger;
44
import net.minecraft.advancements.CriteriaTriggers;
55

66
public class AdvancementTriggers {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.robotgryphon.compactmachines.advancement;
1+
package dev.compactmods.machines.advancement;
22

33
import java.util.Set;
44
import com.google.common.collect.Sets;
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package com.robotgryphon.compactmachines.advancement;
1+
package dev.compactmods.machines.advancement;
22

33
import javax.annotation.Nullable;
44
import java.util.Map;
55
import com.google.common.collect.Maps;
6-
import com.robotgryphon.compactmachines.advancement.trigger.HowDidYouGetHereTrigger;
76
import net.minecraft.advancements.ICriterionInstance;
87
import net.minecraft.advancements.ICriterionTrigger;
98
import net.minecraft.advancements.PlayerAdvancements;
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.robotgryphon.compactmachines.advancement.trigger;
1+
package dev.compactmods.machines.advancement.trigger;
22

33
import com.google.gson.JsonObject;
4-
import com.robotgryphon.compactmachines.advancement.GenericAdvancementTriggerListener;
5-
import com.robotgryphon.compactmachines.advancement.GenericAdvancementTriggerListenerList;
6-
import com.robotgryphon.compactmachines.api.core.Advancements;
4+
import dev.compactmods.machines.advancement.GenericAdvancementTriggerListener;
5+
import dev.compactmods.machines.advancement.GenericAdvancementTriggerListenerList;
6+
import dev.compactmods.machines.api.core.Advancements;
77
import net.minecraft.advancements.ICriterionTrigger;
88
import net.minecraft.advancements.PlayerAdvancements;
99
import net.minecraft.advancements.criterion.CriterionInstance;
@@ -14,7 +14,7 @@
1414

1515
public class HowDidYouGetHereTrigger implements ICriterionTrigger<HowDidYouGetHereTrigger.Instance> {
1616

17-
private final GenericAdvancementTriggerListenerList<HowDidYouGetHereTrigger.Instance> listeners = new GenericAdvancementTriggerListenerList<>();
17+
private final GenericAdvancementTriggerListenerList<Instance> listeners = new GenericAdvancementTriggerListenerList<>();
1818

1919
@Override
2020
public ResourceLocation getId() {

0 commit comments

Comments
 (0)