Merge branch 'cosmo-main' of https://github.com/BigGaemer/terra-originum into cosmo-main

gradle.properties

@@ -7,8 +7,8 @@ yarn_mappings=1.20.1+build.10
 loader_version=0.15.6
 
 # Mod Properties
-mod_version=1.20.1-1.0.3
+mod_version=1.20.1-1.0.4
-maven_group=dev.arcmods
+maven_group=com.smithy
 archives_base_name=TerraOriginum
 
 # Dependencies

src/main/java/com/smithy/terraoriginum/TerraOriginum.java

@@ -1,12 +1,12 @@
-package net.arcmods.arcteam.terraoriginum;
+package com.smithy.terraoriginum;
 
-import net.arcmods.arcteam.terraoriginum.blocks.cottonCropBlock;
+import com.smithy.terraoriginum.blocks.cottonCropBlock;
-import net.arcmods.arcteam.terraoriginum.blocks.crucifix;
+import com.smithy.terraoriginum.blocks.crucifix;
-import net.arcmods.arcteam.terraoriginum.items.iconItems;
+import com.smithy.terraoriginum.items.iconItems;
-import net.arcmods.arcteam.terraoriginum.items.sun_totem;
+import com.smithy.terraoriginum.items.sun_totem;
-import net.arcmods.arcteam.terraoriginum.items.cottonItems;
+import com.smithy.terraoriginum.items.cottonItems;
-import net.arcmods.arcteam.terraoriginum.items.umbrella;
+import com.smithy.terraoriginum.items.umbrella;
-import net.arcmods.arcteam.terraoriginum.registry.modEnchantments;
+import com.smithy.terraoriginum.registry.modEnchantments;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.item.ItemGroups;

src/main/java/com/smithy/terraoriginum/blocks/cottonCropBlock.java

@@ -1,6 +1,6 @@
-package net.arcmods.arcteam.terraoriginum.blocks;
+package com.smithy.terraoriginum.blocks;
 
-import net.arcmods.arcteam.terraoriginum.items.cottonItems;
+import com.smithy.terraoriginum.items.cottonItems;
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;

src/main/java/com/smithy/terraoriginum/blocks/crucifix.java

@@ -1,6 +1,6 @@
-package net.arcmods.arcteam.terraoriginum.blocks;
+package com.smithy.terraoriginum.blocks;
 
-import net.arcmods.arcteam.terraoriginum.TerraOriginum;
+import com.smithy.terraoriginum.TerraOriginum;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.Block;
 import net.minecraft.item.BlockItem;

src/main/java/com/smithy/terraoriginum/blocks/crucifixClass.java

@@ -1,4 +1,4 @@
-package net.arcmods.arcteam.terraoriginum.blocks;
+package com.smithy.terraoriginum.blocks;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;

src/main/java/com/smithy/terraoriginum/client/TerraKeybinds.java

@@ -1,4 +1,4 @@
-package net.arcmods.arcteam.terraoriginum.client;
+package com.smithy.terraoriginum.client;
 
 import io.github.apace100.apoli.ApoliClient;
 import net.fabricmc.api.ClientModInitializer;

src/main/java/com/smithy/terraoriginum/client/layerRenderer.java

@@ -1,7 +1,7 @@
-package net.arcmods.arcteam.terraoriginum.client;
+package com.smithy.terraoriginum.client;
 
-import net.arcmods.arcteam.terraoriginum.blocks.cottonCropBlock;
+import com.smithy.terraoriginum.blocks.cottonCropBlock;
-import net.arcmods.arcteam.terraoriginum.items.umbrella;
+import com.smithy.terraoriginum.items.umbrella;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
 import net.minecraft.client.render.RenderLayer;

src/main/java/com/smithy/terraoriginum/enchantment/SunProtectionEnchantment.java

@@ -1,4 +1,4 @@
-package net.arcmods.arcteam.terraoriginum.enchantment;
+package com.smithy.terraoriginum.enchantment;
 
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentTarget;

src/main/java/com/smithy/terraoriginum/items/cottonItems.java

@@ -1,6 +1,6 @@
-package net.arcmods.arcteam.terraoriginum.items;
+package com.smithy.terraoriginum.items;
 
-import net.arcmods.arcteam.terraoriginum.blocks.cottonCropBlock;
+import com.smithy.terraoriginum.blocks.cottonCropBlock;
 import net.minecraft.item.AliasedBlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.registry.Registries;

src/main/java/com/smithy/terraoriginum/items/iconItems.java

@@ -1,6 +1,6 @@
-package net.arcmods.arcteam.terraoriginum.items;
+package com.smithy.terraoriginum.items;
 
-import net.arcmods.arcteam.terraoriginum.TerraOriginum;
+import com.smithy.terraoriginum.TerraOriginum;
 import net.minecraft.item.Item;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Rarity;

src/main/java/com/smithy/terraoriginum/items/sun_totem.java

@@ -1,6 +1,6 @@
-package net.arcmods.arcteam.terraoriginum.items;
+package com.smithy.terraoriginum.items;
 
-import net.arcmods.arcteam.terraoriginum.TerraOriginum;
+import com.smithy.terraoriginum.TerraOriginum;
 import net.minecraft.item.Item;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;

src/main/java/com/smithy/terraoriginum/items/umbrella.java

@@ -1,6 +1,6 @@
-package net.arcmods.arcteam.terraoriginum.items;
+package com.smithy.terraoriginum.items;
 
-import net.arcmods.arcteam.terraoriginum.TerraOriginum;
+import com.smithy.terraoriginum.TerraOriginum;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;

src/main/java/com/smithy/terraoriginum/items/umbrellaDyeTest.java

@@ -1,4 +1,4 @@
-package net.arcmods.arcteam.terraoriginum.items;
+package com.smithy.terraoriginum.items;
 
 import net.minecraft.item.DyeableItem;
 import net.minecraft.item.Item;

src/main/java/com/smithy/terraoriginum/mixin/EntityMixin.java

@@ -1,6 +1,6 @@
-package net.arcmods.arcteam.terraoriginum.mixin;
+package com.smithy.terraoriginum.mixin;
 
-import net.arcmods.arcteam.terraoriginum.items.umbrella;
+import com.smithy.terraoriginum.items.umbrella;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;

src/main/java/com/smithy/terraoriginum/mixin/PlayerConditionsMixin.java

@@ -1,8 +1,8 @@
-package net.arcmods.arcteam.terraoriginum.mixin;
+package com.smithy.terraoriginum.mixin;
 
 import io.github.apace100.apoli.power.factory.condition.EntityConditions;
 import io.github.apace100.calio.data.SerializableData;
-import net.arcmods.arcteam.terraoriginum.items.umbrella;
+import com.smithy.terraoriginum.items.umbrella;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/com/smithy/terraoriginum/mixin/PlayerEntityMixin.java

@@ -1,7 +1,7 @@
-package net.arcmods.arcteam.terraoriginum.mixin;
+package com.smithy.terraoriginum.mixin;
 
 import io.github.apace100.apoli.mixin.EntityAccessor;
-import net.arcmods.arcteam.terraoriginum.items.umbrella;
+import com.smithy.terraoriginum.items.umbrella;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;

src/main/java/com/smithy/terraoriginum/registry/modEnchantments.java

@@ -1,7 +1,7 @@
-package net.arcmods.arcteam.terraoriginum.registry;
+package com.smithy.terraoriginum.registry;
 
-import net.arcmods.arcteam.terraoriginum.TerraOriginum;
+import com.smithy.terraoriginum.TerraOriginum;
-import net.arcmods.arcteam.terraoriginum.enchantment.SunProtectionEnchantment;
+import com.smithy.terraoriginum.enchantment.SunProtectionEnchantment;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentTarget;
 import net.minecraft.entity.EquipmentSlot;

src/main/resources/fabric.mod.json

@@ -20,11 +20,11 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "net.arcmods.arcteam.terraoriginum.TerraOriginum"
+      "com.smithy.terraoriginum.TerraOriginum"
     ],
     "client": [
-      "net.arcmods.arcteam.terraoriginum.client.TerraKeybinds",
+      "com.smithy.terraoriginum.client.TerraKeybinds",
-      "net.arcmods.arcteam.terraoriginum.client.layerRenderer"
+      "com.smithy.terraoriginum.client.layerRenderer"
   ]
   },
   "mixins": [

src/main/resources/terra.mixins.json

@@ -1,7 +1,7 @@
 {
 	"required": true,
 	"minVersion": "0.8",
-	"package": "net.arcmods.arcteam.terraoriginum.mixin",
+	"package": "com.smithy.terraoriginum.mixin",
 	"compatibilityLevel": "JAVA_16",
 	"mixins": [
 		"PlayerConditionsMixin",