Rename module forge -> neoforge

ochotonida · Apr 28, 2024 · 0fbee5c · 0fbee5c
1 parent 1992915
commit 0fbee5c
Show file tree

Hide file tree

Showing 55 changed files with 53 additions and 53 deletions.
diff --git a/forge/src/main/resources/META-INF/services/artifacts.platform.PlatformHelper b/forge/src/main/resources/META-INF/services/artifacts.platform.PlatformHelper
diff --git a/forge/build.gradle → neoforge/build.gradle b/forge/build.gradle → neoforge/build.gradle
diff --git a/forge/gradle.properties → neoforge/gradle.properties b/forge/gradle.properties → neoforge/gradle.properties
diff --git a/...n/java/artifacts/forge/ArtifactsData.java → ...ava/artifacts/neoforge/ArtifactsData.java b/...n/java/artifacts/forge/ArtifactsData.java → ...ava/artifacts/neoforge/ArtifactsData.java
@@ -1,7 +1,7 @@
-package artifacts.forge;
+package artifacts.neoforge;
 
 import artifacts.Artifacts;
-import artifacts.forge.data.*;
+import artifacts.neoforge.data.*;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.RegistrySetBuilder;
 import net.minecraft.core.registries.Registries;

diff --git a/.../java/artifacts/forge/ArtifactsForge.java → ...va/artifacts/neoforge/ArtifactsForge.java b/.../java/artifacts/forge/ArtifactsForge.java → ...va/artifacts/neoforge/ArtifactsForge.java
@@ -1,13 +1,13 @@
-package artifacts.forge;
+package artifacts.neoforge;
 
 import artifacts.Artifacts;
 import artifacts.config.ModConfig;
-import artifacts.forge.curio.WearableArtifactCurio;
-import artifacts.forge.event.ArtifactEventsForge;
-import artifacts.forge.event.SwimEventsForge;
-import artifacts.forge.registry.ModAttachmentTypes;
-import artifacts.forge.registry.ModItemsForge;
-import artifacts.forge.registry.ModLootModifiers;
+import artifacts.neoforge.curio.WearableArtifactCurio;
+import artifacts.neoforge.event.ArtifactEventsForge;
+import artifacts.neoforge.event.SwimEventsForge;
+import artifacts.neoforge.registry.ModAttachmentTypes;
+import artifacts.neoforge.registry.ModItemsForge;
+import artifacts.neoforge.registry.ModLootModifiers;
 import artifacts.item.wearable.WearableArtifactItem;
 import artifacts.registry.ModItems;
 import me.shedaniel.autoconfig.AutoConfig;

diff --git a/...artifacts/forge/ArtifactsForgeClient.java → ...ifacts/neoforge/ArtifactsForgeClient.java b/...artifacts/forge/ArtifactsForgeClient.java → ...ifacts/neoforge/ArtifactsForgeClient.java
@@ -1,12 +1,12 @@
-package artifacts.forge;
+package artifacts.neoforge;
 
 import artifacts.Artifacts;
 import artifacts.ArtifactsClient;
 import artifacts.client.item.ArtifactRenderers;
-import artifacts.forge.client.ArmRenderHandler;
-import artifacts.forge.client.ArtifactCooldownOverlayRenderer;
-import artifacts.forge.client.HeliumFlamingoOverlayRenderer;
-import artifacts.forge.client.UmbrellaArmPoseHandler;
+import artifacts.neoforge.client.ArmRenderHandler;
+import artifacts.neoforge.client.ArtifactCooldownOverlayRenderer;
+import artifacts.neoforge.client.HeliumFlamingoOverlayRenderer;
+import artifacts.neoforge.client.UmbrellaArmPoseHandler;
 import artifacts.mixin.accessors.client.LivingEntityRendererAccessor;
 import artifacts.registry.ModItems;
 import artifacts.registry.ModLootTables;

diff --git a/...ifacts/forge/client/ArmRenderHandler.java → ...cts/neoforge/client/ArmRenderHandler.java b/...ifacts/forge/client/ArmRenderHandler.java → ...cts/neoforge/client/ArmRenderHandler.java
@@ -1,4 +1,4 @@
-package artifacts.forge.client;
+package artifacts.neoforge.client;
 
 import artifacts.Artifacts;
 import artifacts.client.item.renderer.GloveArtifactRenderer;

diff --git a/...ient/ArtifactCooldownOverlayRenderer.java → ...ient/ArtifactCooldownOverlayRenderer.java b/...ient/ArtifactCooldownOverlayRenderer.java → ...ient/ArtifactCooldownOverlayRenderer.java
@@ -1,4 +1,4 @@
-package artifacts.forge.client;
+package artifacts.neoforge.client;
 
 import artifacts.Artifacts;
 import artifacts.item.wearable.WearableArtifactItem;

diff --git a/...client/HeliumFlamingoOverlayRenderer.java → ...client/HeliumFlamingoOverlayRenderer.java b/...client/HeliumFlamingoOverlayRenderer.java → ...client/HeliumFlamingoOverlayRenderer.java
@@ -1,4 +1,4 @@
-package artifacts.forge.client;
+package artifacts.neoforge.client;
 
 import artifacts.client.HeliumFlamingoOverlay;
 import net.minecraft.client.Minecraft;

diff --git a/.../forge/client/UmbrellaArmPoseHandler.java → ...oforge/client/UmbrellaArmPoseHandler.java b/.../forge/client/UmbrellaArmPoseHandler.java → ...oforge/client/UmbrellaArmPoseHandler.java
@@ -1,4 +1,4 @@
-package artifacts.forge.client;
+package artifacts.neoforge.client;
 
 import artifacts.client.UmbrellaArmPoseHelper;
 import net.neoforged.neoforge.client.event.RenderLivingEvent;

diff --git a/...ts/forge/curio/WearableArtifactCurio.java → ...neoforge/curio/WearableArtifactCurio.java b/...ts/forge/curio/WearableArtifactCurio.java → ...neoforge/curio/WearableArtifactCurio.java
@@ -1,4 +1,4 @@
-package artifacts.forge.curio;
+package artifacts.neoforge.curio;
 
 import artifacts.item.wearable.WearableArtifactItem;
 import artifacts.util.DamageSourceHelper;

diff --git a/...va/artifacts/forge/data/Advancements.java → ...artifacts/neoforge/data/Advancements.java b/...va/artifacts/forge/data/Advancements.java → ...artifacts/neoforge/data/Advancements.java
@@ -1,4 +1,4 @@
-package artifacts.forge.data;
+package artifacts.neoforge.data;
 
 import artifacts.Artifacts;
 import artifacts.registry.ModEntityTypes;

diff --git a/.../java/artifacts/forge/data/BlockTags.java → ...va/artifacts/neoforge/data/BlockTags.java b/.../java/artifacts/forge/data/BlockTags.java → ...va/artifacts/neoforge/data/BlockTags.java
@@ -1,4 +1,4 @@
-package artifacts.forge.data;
+package artifacts.neoforge.data;
 
 import artifacts.Artifacts;
 import artifacts.client.mimic.MimicChestLayer;

diff --git a/...ifacts/forge/data/ConfiguredFeatures.java → ...cts/neoforge/data/ConfiguredFeatures.java b/...ifacts/forge/data/ConfiguredFeatures.java → ...cts/neoforge/data/ConfiguredFeatures.java
@@ -1,4 +1,4 @@
-package artifacts.forge.data;
+package artifacts.neoforge.data;
 
 import artifacts.Artifacts;
 import artifacts.registry.ModFeatures;

diff --git a/...artifacts/forge/data/EntityEquipment.java → ...ifacts/neoforge/data/EntityEquipment.java b/...artifacts/forge/data/EntityEquipment.java → ...ifacts/neoforge/data/EntityEquipment.java
@@ -1,4 +1,4 @@
-package artifacts.forge.data;
+package artifacts.neoforge.data;
 
 import artifacts.loot.ConfigValueChance;
 import artifacts.registry.ModItems;

diff --git a/.../artifacts/forge/data/EntityTypeTags.java → ...tifacts/neoforge/data/EntityTypeTags.java b/.../artifacts/forge/data/EntityTypeTags.java → ...tifacts/neoforge/data/EntityTypeTags.java
@@ -1,4 +1,4 @@
-package artifacts.forge.data;
+package artifacts.neoforge.data;
 
 import artifacts.Artifacts;
 import artifacts.registry.ModEntityTypes;

diff --git a/...java/artifacts/forge/data/ItemModels.java → ...a/artifacts/neoforge/data/ItemModels.java b/...java/artifacts/forge/data/ItemModels.java → ...a/artifacts/neoforge/data/ItemModels.java
@@ -1,4 +1,4 @@
-package artifacts.forge.data;
+package artifacts.neoforge.data;
 
 import artifacts.Artifacts;
 import artifacts.registry.ModItems;

diff --git a/...n/java/artifacts/forge/data/ItemTags.java → ...ava/artifacts/neoforge/data/ItemTags.java b/...n/java/artifacts/forge/data/ItemTags.java → ...ava/artifacts/neoforge/data/ItemTags.java
@@ -1,4 +1,4 @@
-package artifacts.forge.data;
+package artifacts.neoforge.data;
 
 import artifacts.Artifacts;
 import artifacts.item.wearable.WearableArtifactItem;

diff --git a/...a/artifacts/forge/data/LootModifiers.java → ...rtifacts/neoforge/data/LootModifiers.java b/...a/artifacts/forge/data/LootModifiers.java → ...rtifacts/neoforge/data/LootModifiers.java
@@ -1,7 +1,7 @@
-package artifacts.forge.data;
+package artifacts.neoforge.data;
 
 import artifacts.Artifacts;
-import artifacts.forge.loot.RollLootTableModifier;
+import artifacts.neoforge.loot.RollLootTableModifier;
 import artifacts.loot.ArtifactRarityAdjustedChance;
 import artifacts.loot.ConfigValueChance;
 import artifacts.registry.ModItems;

diff --git a/...java/artifacts/forge/data/LootTables.java → ...a/artifacts/neoforge/data/LootTables.java b/...java/artifacts/forge/data/LootTables.java → ...a/artifacts/neoforge/data/LootTables.java
@@ -1,4 +1,4 @@
-package artifacts.forge.data;
+package artifacts.neoforge.data;
 
 import artifacts.Artifacts;
 import artifacts.entity.MimicEntity;

diff --git a/...a/artifacts/forge/data/MobEffectTags.java → ...rtifacts/neoforge/data/MobEffectTags.java b/...a/artifacts/forge/data/MobEffectTags.java → ...rtifacts/neoforge/data/MobEffectTags.java
@@ -1,4 +1,4 @@
-package artifacts.forge.data;
+package artifacts.neoforge.data;
 
 import artifacts.Artifacts;
 import artifacts.registry.ModTags;

diff --git a/.../artifacts/forge/data/PlacedFeatures.java → ...tifacts/neoforge/data/PlacedFeatures.java b/.../artifacts/forge/data/PlacedFeatures.java → ...tifacts/neoforge/data/PlacedFeatures.java
@@ -1,4 +1,4 @@
-package artifacts.forge.data;
+package artifacts.neoforge.data;
 
 import artifacts.registry.ModFeatures;
 import artifacts.world.placement.CampsiteCountPlacement;

diff --git a/...rtifacts/forge/data/SoundDefinitions.java → ...facts/neoforge/data/SoundDefinitions.java b/...rtifacts/forge/data/SoundDefinitions.java → ...facts/neoforge/data/SoundDefinitions.java
@@ -1,4 +1,4 @@
-package artifacts.forge.data;
+package artifacts.neoforge.data;
 
 import artifacts.Artifacts;
 import artifacts.registry.ModSoundEvents;

diff --git a/...acts/forge/event/ArtifactEventsForge.java → ...s/neoforge/event/ArtifactEventsForge.java b/...acts/forge/event/ArtifactEventsForge.java → ...s/neoforge/event/ArtifactEventsForge.java
@@ -1,4 +1,4 @@
-package artifacts.forge.event;
+package artifacts.neoforge.event;
 
 import artifacts.item.UmbrellaItem;
 import artifacts.item.wearable.belt.CloudInABottleItem;

diff --git a/...rtifacts/forge/event/SwimEventsForge.java → ...facts/neoforge/event/SwimEventsForge.java b/...rtifacts/forge/event/SwimEventsForge.java → ...facts/neoforge/event/SwimEventsForge.java
@@ -1,4 +1,4 @@
-package artifacts.forge.event;
+package artifacts.neoforge.event;
 
 import artifacts.component.SwimEventHandler;
 import artifacts.item.wearable.feet.AquaDashersItem;

diff --git a/...orge/integration/CosmeticArmorCompat.java → ...orge/integration/CosmeticArmorCompat.java b/...orge/integration/CosmeticArmorCompat.java → ...orge/integration/CosmeticArmorCompat.java
@@ -1,4 +1,4 @@
-package artifacts.forge.integration;
+package artifacts.neoforge.integration;
 
 import lain.mods.cos.api.CosArmorAPI;
 import net.minecraft.world.entity.player.Player;

diff --git a/...cts/forge/loot/RollLootTableModifier.java → .../neoforge/loot/RollLootTableModifier.java b/...cts/forge/loot/RollLootTableModifier.java → .../neoforge/loot/RollLootTableModifier.java
@@ -1,4 +1,4 @@
-package artifacts.forge.loot;
+package artifacts.neoforge.loot;
 
 import com.google.common.base.Suppliers;
 import com.mojang.serialization.Codec;

diff --git a/...t/SmeltOresWithPickaxeHeaterModifier.java → ...t/SmeltOresWithPickaxeHeaterModifier.java b/...t/SmeltOresWithPickaxeHeaterModifier.java → ...t/SmeltOresWithPickaxeHeaterModifier.java
@@ -1,4 +1,4 @@
-package artifacts.forge.loot;
+package artifacts.neoforge.loot;
 
 import artifacts.item.wearable.hands.PickaxeHeaterItem;
 import com.google.common.base.Suppliers;

diff --git a/...ixin/item/umbrella/UmbrellaItemMixin.java → ...ixin/item/umbrella/UmbrellaItemMixin.java b/...ixin/item/umbrella/UmbrellaItemMixin.java → ...ixin/item/umbrella/UmbrellaItemMixin.java
@@ -1,4 +1,4 @@
-package artifacts.forge.mixin.item.umbrella;
+package artifacts.neoforge.mixin.item.umbrella;
 
 import artifacts.item.UmbrellaItem;
 import artifacts.registry.ModGameRules;

diff --git a/...m/wearable/WearableArtifactItemMixin.java → ...m/wearable/WearableArtifactItemMixin.java b/...m/wearable/WearableArtifactItemMixin.java → ...m/wearable/WearableArtifactItemMixin.java
@@ -1,4 +1,4 @@
-package artifacts.forge.mixin.item.wearable;
+package artifacts.neoforge.mixin.item.wearable;
 
 import artifacts.Artifacts;
 import artifacts.item.ArtifactItem;

diff --git a/...wearable/snowshoes/LivingEntityMixin.java → ...wearable/snowshoes/LivingEntityMixin.java b/...wearable/snowshoes/LivingEntityMixin.java → ...wearable/snowshoes/LivingEntityMixin.java
@@ -1,4 +1,4 @@
-package artifacts.forge.mixin.item.wearable.snowshoes;
+package artifacts.neoforge.mixin.item.wearable.snowshoes;
 
 import artifacts.item.wearable.feet.SnowshoesItem;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;

diff --git a/...s/forge/platform/ForgePlatformHelper.java → ...eoforge/platform/ForgePlatformHelper.java b/...s/forge/platform/ForgePlatformHelper.java → ...eoforge/platform/ForgePlatformHelper.java
@@ -1,9 +1,9 @@
-package artifacts.forge.platform;
+package artifacts.neoforge.platform;
 
 import artifacts.client.item.renderer.ArtifactRenderer;
 import artifacts.component.SwimData;
-import artifacts.forge.integration.CosmeticArmorCompat;
-import artifacts.forge.registry.ModAttachmentTypes;
+import artifacts.neoforge.integration.CosmeticArmorCompat;
+import artifacts.neoforge.registry.ModAttachmentTypes;
 import artifacts.item.wearable.WearableArtifactItem;
 import artifacts.platform.PlatformHelper;
 import com.mojang.blaze3d.vertex.PoseStack;

diff --git a/...ts/forge/registry/ModAttachmentTypes.java → ...neoforge/registry/ModAttachmentTypes.java b/...ts/forge/registry/ModAttachmentTypes.java → ...neoforge/registry/ModAttachmentTypes.java
@@ -1,4 +1,4 @@
-package artifacts.forge.registry;
+package artifacts.neoforge.registry;
 
 import artifacts.Artifacts;
 import artifacts.component.SwimData;

diff --git a/...tifacts/forge/registry/ModItemsForge.java → ...acts/neoforge/registry/ModItemsForge.java b/...tifacts/forge/registry/ModItemsForge.java → ...acts/neoforge/registry/ModItemsForge.java
@@ -1,4 +1,4 @@
-package artifacts.forge.registry;
+package artifacts.neoforge.registry;
 
 import artifacts.Artifacts;
 import artifacts.item.wearable.ArtifactAttributeModifier;

diff --git a/...acts/forge/registry/ModLootModifiers.java → ...s/neoforge/registry/ModLootModifiers.java b/...acts/forge/registry/ModLootModifiers.java → ...s/neoforge/registry/ModLootModifiers.java
@@ -1,8 +1,8 @@
-package artifacts.forge.registry;
+package artifacts.neoforge.registry;
 
 import artifacts.Artifacts;
-import artifacts.forge.loot.RollLootTableModifier;
-import artifacts.forge.loot.SmeltOresWithPickaxeHeaterModifier;
+import artifacts.neoforge.loot.RollLootTableModifier;
+import artifacts.neoforge.loot.SmeltOresWithPickaxeHeaterModifier;
 import com.mojang.serialization.Codec;
 import net.neoforged.neoforge.common.loot.IGlobalLootModifier;
 import net.neoforged.neoforge.registries.DeferredHolder;

diff --git a/forge/src/main/resources/META-INF/mods.toml → ...rge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml → ...rge/src/main/resources/META-INF/mods.toml
@@ -8,14 +8,14 @@ modId="artifacts"
 version="${version}"
 displayName="Artifacts"
 displayURL="https://www.curseforge.com/minecraft/mc-mods/artifacts"
-logoFile="logo.png"
+logoFile= "../logo.png"
 authors="ochotonida"
 description='''Adds various new powerful uncraftable items to make exploration a bit more interesting'''
 
 [[mixins]]
 config="mixins.artifacts.common.json"
 [[mixins]]
-config="mixins.artifacts.forge.json"
+config="mixins.artifacts.neoforge.json"
 
 [[dependencies.artifacts]]
     modId="neoforge"

diff --git a/neoforge/src/main/resources/META-INF/services/artifacts.platform.PlatformHelper b/neoforge/src/main/resources/META-INF/services/artifacts.platform.PlatformHelper
@@ -0,0 +1 @@
+artifacts.neoforge.platform.ForgePlatformHelper
diff --git a/...ssets/artifacts/models/item/umbrella.json → ...ssets/artifacts/models/item/umbrella.json b/...ssets/artifacts/models/item/umbrella.json → ...ssets/artifacts/models/item/umbrella.json
diff --git a/...ifacts/models/item/umbrella_blocking.json → ...ifacts/models/item/umbrella_blocking.json b/...ifacts/models/item/umbrella_blocking.json → ...ifacts/models/item/umbrella_blocking.json
diff --git a/.../artifacts/models/item/umbrella_idle.json → .../artifacts/models/item/umbrella_idle.json b/.../artifacts/models/item/umbrella_idle.json → .../artifacts/models/item/umbrella_idle.json
diff --git a/...data/artifacts/curios/entities/slots.json → ...data/artifacts/curios/entities/slots.json b/...data/artifacts/curios/entities/slots.json → ...data/artifacts/curios/entities/slots.json
diff --git a/...ces/data/artifacts/curios/slots/feet.json → ...ces/data/artifacts/curios/slots/feet.json b/...ces/data/artifacts/curios/slots/feet.json → ...ces/data/artifacts/curios/slots/feet.json
diff --git a/...es/data/artifacts/curios/slots/hands.json → ...es/data/artifacts/curios/slots/hands.json b/...es/data/artifacts/curios/slots/hands.json → ...es/data/artifacts/curios/slots/hands.json
diff --git a/...fiers/smelt_ores_with_pickaxe_heater.json → ...fiers/smelt_ores_with_pickaxe_heater.json b/...fiers/smelt_ores_with_pickaxe_heater.json → ...fiers/smelt_ores_with_pickaxe_heater.json
diff --git a/...neoforge/biome_modifier/add_campsite.json → ...neoforge/biome_modifier/add_campsite.json b/...neoforge/biome_modifier/add_campsite.json → ...neoforge/biome_modifier/add_campsite.json
diff --git a/...esources/data/curios/tags/items/belt.json → ...esources/data/curios/tags/items/belt.json b/...esources/data/curios/tags/items/belt.json → ...esources/data/curios/tags/items/belt.json
diff --git a/...sources/data/curios/tags/items/curio.json → ...sources/data/curios/tags/items/curio.json b/...sources/data/curios/tags/items/curio.json → ...sources/data/curios/tags/items/curio.json
diff --git a/...esources/data/curios/tags/items/feet.json → ...esources/data/curios/tags/items/feet.json b/...esources/data/curios/tags/items/feet.json → ...esources/data/curios/tags/items/feet.json
diff --git a/...sources/data/curios/tags/items/hands.json → ...sources/data/curios/tags/items/hands.json b/...sources/data/curios/tags/items/hands.json → ...sources/data/curios/tags/items/hands.json
diff --git a/...esources/data/curios/tags/items/head.json → ...esources/data/curios/tags/items/head.json b/...esources/data/curios/tags/items/head.json → ...esources/data/curios/tags/items/head.json
diff --git a/...rces/data/curios/tags/items/necklace.json → ...rces/data/curios/tags/items/necklace.json b/...rces/data/curios/tags/items/necklace.json → ...rces/data/curios/tags/items/necklace.json
diff --git a/...loot_modifiers/global_loot_modifiers.json → ...loot_modifiers/global_loot_modifiers.json b/...loot_modifiers/global_loot_modifiers.json → ...loot_modifiers/global_loot_modifiers.json
diff --git a/forge/src/main/resources/logo.png → neoforge/src/main/resources/logo.png b/forge/src/main/resources/logo.png → neoforge/src/main/resources/logo.png
diff --git a/...ain/resources/mixins.artifacts.forge.json → .../resources/mixins.artifacts.neoforge.json b/...ain/resources/mixins.artifacts.forge.json → .../resources/mixins.artifacts.neoforge.json
@@ -1,7 +1,7 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "artifacts.forge.mixin",
+  "package": "artifacts.neoforge.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
     "item.umbrella.UmbrellaItemMixin",

diff --git a/settings.gradle b/settings.gradle
@@ -9,6 +9,6 @@ pluginManagement {
 
 include("common")
 include("fabric")
-include("forge")
+include("neoforge")
 
 rootProject.name = "artifacts"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		artifacts.neoforge.platform.ForgePlatformHelper