changed maven group and package names

GT-Reimagined · Oct 19, 2024 · e97bb4e · e97bb4e
1 parent 29fd7df
commit e97bb4e
Show file tree

Hide file tree

Showing 149 changed files with 633 additions and 510 deletions.
diff --git a/...regtechintergalactical/gtcore/GTCore.java → .../java/org/gtreimagined/gtcore/GTCore.java b/...regtechintergalactical/gtcore/GTCore.java → .../java/org/gtreimagined/gtcore/GTCore.java
@@ -1,31 +1,35 @@
-package io.github.gregtechintergalactical.gtcore;
+package org.gtreimagined.gtcore;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.teamresourceful.resourcefullib.common.networking.base.NetworkDirection;
-import io.github.gregtechintergalactical.gtcore.client.BakedModels;
-import io.github.gregtechintergalactical.gtcore.data.*;
-import io.github.gregtechintergalactical.gtcore.data.client.ScreenFactories;
-import io.github.gregtechintergalactical.gtcore.datagen.GTCoreBlockLootProvider;
-import io.github.gregtechintergalactical.gtcore.datagen.GTCoreBlockTagProvider;
-import io.github.gregtechintergalactical.gtcore.datagen.GTCoreItemTagProvider;
-import io.github.gregtechintergalactical.gtcore.datagen.GTCoreLang;
-import io.github.gregtechintergalactical.gtcore.events.GTCommonEvents;
-import io.github.gregtechintergalactical.gtcore.integration.top.MassStorageProvider;
-import io.github.gregtechintergalactical.gtcore.loader.crafting.MachineRecipes;
-import io.github.gregtechintergalactical.gtcore.loader.crafting.MaterialRecipes;
-import io.github.gregtechintergalactical.gtcore.loader.crafting.Pipes;
-import io.github.gregtechintergalactical.gtcore.loader.crafting.RubberRecipes;
-import io.github.gregtechintergalactical.gtcore.loader.crafting.Tools;
-import io.github.gregtechintergalactical.gtcore.loader.crafting.VanillaRecipes;
-import io.github.gregtechintergalactical.gtcore.loader.machines.AssemblyLoader;
-import io.github.gregtechintergalactical.gtcore.network.MessageCraftingSync;
-import io.github.gregtechintergalactical.gtcore.network.MessageInventorySync;
-import io.github.gregtechintergalactical.gtcore.network.MessageTriggerInventorySync;
-import io.github.gregtechintergalactical.gtcore.proxy.CommonHandler;
-import io.github.gregtechintergalactical.gtcore.tree.RubberTree;
-import io.github.gregtechintergalactical.gtcore.tree.RubberTreeWorldGen;
+import org.gtreimagined.gtcore.client.BakedModels;
+import org.gtreimagined.gtcore.data.GTCoreCables;
+import org.gtreimagined.gtcore.data.GTCoreData;
+import org.gtreimagined.gtcore.data.GTCoreItems;
+import org.gtreimagined.gtcore.data.GTCoreTools;
+import org.gtreimagined.gtcore.data.SlotTypes;
+import org.gtreimagined.gtcore.data.client.ScreenFactories;
+import org.gtreimagined.gtcore.datagen.GTCoreBlockLootProvider;
+import org.gtreimagined.gtcore.datagen.GTCoreBlockTagProvider;
+import org.gtreimagined.gtcore.datagen.GTCoreItemTagProvider;
+import org.gtreimagined.gtcore.datagen.GTCoreLang;
+import org.gtreimagined.gtcore.events.GTCommonEvents;
+import org.gtreimagined.gtcore.integration.top.MassStorageProvider;
+import org.gtreimagined.gtcore.loader.crafting.MachineRecipes;
+import org.gtreimagined.gtcore.loader.crafting.MaterialRecipes;
+import org.gtreimagined.gtcore.loader.crafting.Pipes;
+import org.gtreimagined.gtcore.loader.crafting.RubberRecipes;
+import org.gtreimagined.gtcore.loader.crafting.Tools;
+import org.gtreimagined.gtcore.loader.crafting.VanillaRecipes;
+import org.gtreimagined.gtcore.loader.machines.AssemblyLoader;
+import org.gtreimagined.gtcore.network.MessageCraftingSync;
+import org.gtreimagined.gtcore.network.MessageInventorySync;
+import org.gtreimagined.gtcore.network.MessageTriggerInventorySync;
+import org.gtreimagined.gtcore.proxy.CommonHandler;
+import org.gtreimagined.gtcore.tree.RubberTree;
+import org.gtreimagined.gtcore.tree.RubberTreeWorldGen;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.AntimatterMod;
 import muramasa.antimatter.Ref;
@@ -60,12 +64,40 @@
 import net.minecraft.world.level.block.state.properties.WoodType;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.gtreimagined.gtcore.client.BakedModels;
+import org.gtreimagined.gtcore.data.GTCoreBlocks;
+import org.gtreimagined.gtcore.data.GTCoreCovers;
+import org.gtreimagined.gtcore.data.GTCoreFluids;
+import org.gtreimagined.gtcore.data.GTCoreMaterials;
+import org.gtreimagined.gtcore.data.Guis;
+import org.gtreimagined.gtcore.data.MenuHandlers;
+import org.gtreimagined.gtcore.data.RecipeMaps;
+import org.gtreimagined.gtcore.data.client.ScreenFactories;
+import org.gtreimagined.gtcore.datagen.GTCoreBlockLootProvider;
+import org.gtreimagined.gtcore.datagen.GTCoreBlockTagProvider;
+import org.gtreimagined.gtcore.datagen.GTCoreItemTagProvider;
+import org.gtreimagined.gtcore.datagen.GTCoreLang;
+import org.gtreimagined.gtcore.events.GTCommonEvents;
+import org.gtreimagined.gtcore.integration.top.MassStorageProvider;
+import org.gtreimagined.gtcore.loader.crafting.MachineRecipes;
+import org.gtreimagined.gtcore.loader.crafting.MaterialRecipes;
+import org.gtreimagined.gtcore.loader.crafting.Pipes;
+import org.gtreimagined.gtcore.loader.crafting.RubberRecipes;
+import org.gtreimagined.gtcore.loader.crafting.Tools;
+import org.gtreimagined.gtcore.loader.crafting.VanillaRecipes;
+import org.gtreimagined.gtcore.loader.machines.AssemblyLoader;
+import org.gtreimagined.gtcore.network.MessageCraftingSync;
+import org.gtreimagined.gtcore.network.MessageInventorySync;
+import org.gtreimagined.gtcore.network.MessageTriggerInventorySync;
+import org.gtreimagined.gtcore.proxy.CommonHandler;
+import org.gtreimagined.gtcore.tree.RubberTree;
+import org.gtreimagined.gtcore.tree.RubberTreeWorldGen;
 
 import java.util.Arrays;
 import java.util.function.BiConsumer;
 
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.*;
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.Steeleaf;
+import static org.gtreimagined.gtcore.data.GTCoreMaterials.*;
+import static org.gtreimagined.gtcore.data.GTCoreMaterials.Steeleaf;
 import static muramasa.antimatter.data.AntimatterDefaultTools.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
 import static muramasa.antimatter.material.MaterialTags.RUBBERTOOLS;
@@ -157,28 +189,28 @@ public String getId() {
     @Override
     public void onMaterialEvent(MaterialEvent event) {
         event.setMaterial(GTCoreMaterials.Rubber).asSolid(295, PLATE, RING);
-        event.setMaterial(Plastic).flags(RUBBERTOOLS);
-        event.setMaterial(Beeswax).asDust();
+        event.setMaterial(GTCoreMaterials.Plastic).flags(RUBBERTOOLS);
+        event.setMaterial(GTCoreMaterials.Beeswax).asDust();
         event.setMaterial(GTCoreMaterials.FierySteel).asMetal().tool().toolDamage(4).toolSpeed(9).toolDurability(1024).toolQuality(4)
                 .toolEnchantments(ImmutableMap.of(Enchantments.FIRE_ASPECT, 2)).handleMaterial(AntimatterMaterials.Blaze)
                 .blacklistToolTypes(PICKAXE, SWORD).build();
         event.setMaterial(GTCoreMaterials.Knightmetal).asMetal(GEAR).tool().toolDamage(3).toolSpeed(8).toolDurability(512).toolQuality(3)
                 .blacklistToolTypes(AXE, PICKAXE, SWORD).build();
-        event.setMaterial(Ironwood).asMetal(WOOD).tool().toolDamage(2).toolSpeed(6.5f).toolDurability(512).toolQuality(2)
+        event.setMaterial(GTCoreMaterials.Ironwood).asMetal(WOOD).tool().toolDamage(2).toolSpeed(6.5f).toolDurability(512).toolQuality(2)
                 .toolEnchantments(ImmutableMap.of(Enchantments.KNOCKBACK, 1))
                 .blacklistToolTypes(AXE, PICKAXE, SHOVEL, SWORD, HOE).build();
         event.setMaterial(GTCoreMaterials.Steeleaf).asMetal().tool().toolDamage(4).toolSpeed(8).toolDurability(131).toolQuality(3)
                 .toolEnchantments(ImmutableMap.of(Enchantments.MOB_LOOTING, 2, Enchantments.BLOCK_FORTUNE, 2))
                 .blacklistToolTypes(AXE, PICKAXE, SHOVEL, SWORD, HOE).build();
         if (AntimatterAPI.isModLoaded("twilightforest")){
-            INGOT.replacement(Ironwood, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "ironwood_ingot"));
-            BLOCK.replacement(Ironwood, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "ironwood_block"));
-            INGOT.replacement(Knightmetal, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "knightmetal_ingot"));
-            BLOCK.replacement(Knightmetal, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "knightmetal_block"));
-            INGOT.replacement(Steeleaf, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "steeleaf_ingot"));
-            BLOCK.replacement(Steeleaf, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "steeleaf_block"));
-            INGOT.replacement(FierySteel, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "fiery_ingot"));
-            BLOCK.replacement(FierySteel, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "fiery_block"));
+            INGOT.replacement(GTCoreMaterials.Ironwood, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "ironwood_ingot"));
+            BLOCK.replacement(GTCoreMaterials.Ironwood, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "ironwood_block"));
+            INGOT.replacement(GTCoreMaterials.Knightmetal, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "knightmetal_ingot"));
+            BLOCK.replacement(GTCoreMaterials.Knightmetal, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "knightmetal_block"));
+            INGOT.replacement(GTCoreMaterials.Steeleaf, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "steeleaf_ingot"));
+            BLOCK.replacement(GTCoreMaterials.Steeleaf, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "steeleaf_block"));
+            INGOT.replacement(GTCoreMaterials.FierySteel, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "fiery_ingot"));
+            BLOCK.replacement(GTCoreMaterials.FierySteel, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "fiery_block"));
         }
         GTCoreBlocks.initItemBarrels();
         Guis.init();

diff --git a/...hintergalactical/gtcore/GTCoreConfig.java → ...org/gtreimagined/gtcore/GTCoreConfig.java b/...hintergalactical/gtcore/GTCoreConfig.java → ...org/gtreimagined/gtcore/GTCoreConfig.java
@@ -1,4 +1,4 @@
-package io.github.gregtechintergalactical.gtcore;
+package org.gtreimagined.gtcore;
 
 import carbonconfiglib.config.*;
 import carbonconfiglib.config.ConfigEntry.BoolValue;

diff --git a/...tergalactical/gtcore/GTCoreRemapping.java → .../gtreimagined/gtcore/GTCoreRemapping.java b/...tergalactical/gtcore/GTCoreRemapping.java → .../gtreimagined/gtcore/GTCoreRemapping.java
@@ -1,16 +1,20 @@
-package io.github.gregtechintergalactical.gtcore;
+package org.gtreimagined.gtcore;
 
-import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks;
-import io.github.gregtechintergalactical.gtcore.machine.DrumMachine;
-import io.github.gregtechintergalactical.gtcore.machine.LockerMachine;
-import io.github.gregtechintergalactical.gtcore.machine.WorkbenchMachine;
+import org.gtreimagined.gtcore.data.GTCoreBlocks;
+import org.gtreimagined.gtcore.machine.DrumMachine;
+import org.gtreimagined.gtcore.machine.LockerMachine;
+import org.gtreimagined.gtcore.machine.WorkbenchMachine;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.AntimatterRemapping;
 import muramasa.antimatter.machine.BlockMachine;
 import muramasa.antimatter.registration.IAntimatterObject;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
+import org.gtreimagined.gtcore.data.GTCoreBlocks;
+import org.gtreimagined.gtcore.machine.DrumMachine;
+import org.gtreimagined.gtcore.machine.LockerMachine;
+import org.gtreimagined.gtcore.machine.WorkbenchMachine;
 
 public class GTCoreRemapping {
 

diff --git a/...our/BehaviourElectricWrenchSwitching.java → ...our/BehaviourElectricWrenchSwitching.java b/...our/BehaviourElectricWrenchSwitching.java → ...our/BehaviourElectricWrenchSwitching.java
@@ -1,4 +1,4 @@
-package io.github.gregtechintergalactical.gtcore.behaviour;
+package org.gtreimagined.gtcore.behaviour;
 
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.behaviour.IItemRightClick;
@@ -14,8 +14,8 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreTools.ELECTRIC_WRENCH;
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreTools.ELECTRIC_WRENCH_ALT;
+import static org.gtreimagined.gtcore.data.GTCoreTools.ELECTRIC_WRENCH;
+import static org.gtreimagined.gtcore.data.GTCoreTools.ELECTRIC_WRENCH_ALT;
 import static muramasa.antimatter.data.AntimatterDefaultTools.WRENCH;
 import static muramasa.antimatter.data.AntimatterDefaultTools.WRENCH_ALT;
 

diff --git a/...core/behaviour/BehaviourKnifeTooltip.java → ...core/behaviour/BehaviourKnifeTooltip.java b/...core/behaviour/BehaviourKnifeTooltip.java → ...core/behaviour/BehaviourKnifeTooltip.java
@@ -1,4 +1,4 @@
-package io.github.gregtechintergalactical.gtcore.behaviour;
+package org.gtreimagined.gtcore.behaviour;
 
 import muramasa.antimatter.behaviour.IAddInformation;
 import muramasa.antimatter.tool.IAntimatterTool;

diff --git a/...ehaviour/BehaviourMultitoolSwitching.java → ...ehaviour/BehaviourMultitoolSwitching.java b/...ehaviour/BehaviourMultitoolSwitching.java → ...ehaviour/BehaviourMultitoolSwitching.java
@@ -1,4 +1,4 @@
-package io.github.gregtechintergalactical.gtcore.behaviour;
+package org.gtreimagined.gtcore.behaviour;
 
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.behaviour.IItemRightClick;
@@ -12,7 +12,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreTools.*;
+import static org.gtreimagined.gtcore.data.GTCoreTools.*;
 
 public class BehaviourMultitoolSwitching implements IItemRightClick<IBasicAntimatterTool> {
 

diff --git a/...ical/gtcore/block/BlockMaterialChest.java → ...ined/gtcore/block/BlockMaterialChest.java b/...ical/gtcore/block/BlockMaterialChest.java → ...ined/gtcore/block/BlockMaterialChest.java
@@ -1,8 +1,8 @@
-package io.github.gregtechintergalactical.gtcore.block;
+package org.gtreimagined.gtcore.block;
 
-import io.github.gregtechintergalactical.gtcore.GTCore;
-import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityChest;
-import io.github.gregtechintergalactical.gtcore.machine.BlockMachineMaterial;
+import org.gtreimagined.gtcore.GTCore;
+import org.gtreimagined.gtcore.blockentity.BlockEntityChest;
+import org.gtreimagined.gtcore.machine.BlockMachineMaterial;
 import it.unimi.dsi.fastutil.floats.Float2FloatFunction;
 import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider;
 import muramasa.antimatter.gui.SlotType;
@@ -33,6 +33,8 @@
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.gtreimagined.gtcore.blockentity.BlockEntityChest;
+import org.gtreimagined.gtcore.machine.BlockMachineMaterial;
 
 import java.util.function.BiPredicate;
 

diff --git a/...tical/gtcore/block/BlockRedstoneWire.java → ...gined/gtcore/block/BlockRedstoneWire.java b/...tical/gtcore/block/BlockRedstoneWire.java → ...gined/gtcore/block/BlockRedstoneWire.java
@@ -1,6 +1,6 @@
-package io.github.gregtechintergalactical.gtcore.block;
+package org.gtreimagined.gtcore.block;
 
-import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityRedstoneWire;
+import org.gtreimagined.gtcore.blockentity.BlockEntityRedstoneWire;
 import muramasa.antimatter.Data;
 import muramasa.antimatter.Ref;
 import muramasa.antimatter.blockentity.pipe.BlockEntityPipe;
@@ -16,6 +16,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
+import org.gtreimagined.gtcore.blockentity.BlockEntityRedstoneWire;
 import org.jetbrains.annotations.Nullable;
 
 public class BlockRedstoneWire<T extends RedstoneWire<T>> extends BlockPipe<T> {

diff --git a/...rgalactical/gtcore/block/BlockSapBag.java → ...treimagined/gtcore/block/BlockSapBag.java b/...rgalactical/gtcore/block/BlockSapBag.java → ...treimagined/gtcore/block/BlockSapBag.java
@@ -1,9 +1,9 @@
-package io.github.gregtechintergalactical.gtcore.block;
+package org.gtreimagined.gtcore.block;
 
-import io.github.gregtechintergalactical.gtcore.GTCore;
-import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntitySapBag;
-import io.github.gregtechintergalactical.gtcore.client.BakedModels;
-import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks;
+import org.gtreimagined.gtcore.GTCore;
+import org.gtreimagined.gtcore.blockentity.BlockEntitySapBag;
+import org.gtreimagined.gtcore.client.BakedModels;
+import org.gtreimagined.gtcore.data.GTCoreBlocks;
 import muramasa.antimatter.datagen.builder.AntimatterBlockModelBuilder;
 import muramasa.antimatter.datagen.builder.DynamicConfigBuilder;
 import muramasa.antimatter.datagen.builder.VariantBlockStateBuilder;
@@ -42,6 +42,7 @@
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.gtreimagined.gtcore.blockentity.BlockEntitySapBag;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;

diff --git a/...galactical/gtcore/block/RedstoneWire.java → ...reimagined/gtcore/block/RedstoneWire.java b/...galactical/gtcore/block/RedstoneWire.java → ...reimagined/gtcore/block/RedstoneWire.java
@@ -1,10 +1,11 @@
-package io.github.gregtechintergalactical.gtcore.block;
+package org.gtreimagined.gtcore.block;
 
-import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityRedstoneWire;
+import org.gtreimagined.gtcore.blockentity.BlockEntityRedstoneWire;
 import muramasa.antimatter.material.Material;
 import muramasa.antimatter.pipe.PipeSize;
 import muramasa.antimatter.pipe.types.PipeType;
 import net.minecraft.world.level.block.Block;
+import org.gtreimagined.gtcore.blockentity.BlockEntityRedstoneWire;
 
 import java.util.Set;
 import java.util.stream.Collectors;

diff --git a/...gtcore/blockentity/BlockEntityBarrel.java → ...gtcore/blockentity/BlockEntityBarrel.java b/...gtcore/blockentity/BlockEntityBarrel.java → ...gtcore/blockentity/BlockEntityBarrel.java
@@ -1,7 +1,7 @@
-package io.github.gregtechintergalactical.gtcore.blockentity;
+package org.gtreimagined.gtcore.blockentity;
 
 
-import io.github.gregtechintergalactical.gtcore.machine.MaterialMachine;
+import org.gtreimagined.gtcore.machine.MaterialMachine;
 import muramasa.antimatter.gui.container.ContainerMachine;
 import muramasa.antimatter.machine.MachineState;
 import net.minecraft.core.BlockPos;

diff --git a/.../gtcore/blockentity/BlockEntityChest.java → .../gtcore/blockentity/BlockEntityChest.java b/.../gtcore/blockentity/BlockEntityChest.java → .../gtcore/blockentity/BlockEntityChest.java
@@ -1,7 +1,7 @@
-package io.github.gregtechintergalactical.gtcore.blockentity;
+package org.gtreimagined.gtcore.blockentity;
 
 
-import io.github.gregtechintergalactical.gtcore.machine.MaterialMachine;
+import org.gtreimagined.gtcore.machine.MaterialMachine;
 import muramasa.antimatter.capability.item.ITrackedHandler;
 import muramasa.antimatter.capability.item.TrackedItemHandler;
 import muramasa.antimatter.capability.machine.MachineItemHandler;

diff --git a/...l/gtcore/blockentity/BlockEntityDrum.java → ...d/gtcore/blockentity/BlockEntityDrum.java b/...l/gtcore/blockentity/BlockEntityDrum.java → ...d/gtcore/blockentity/BlockEntityDrum.java
@@ -1,11 +1,11 @@
-package io.github.gregtechintergalactical.gtcore.blockentity;
+package org.gtreimagined.gtcore.blockentity;
 
 import earth.terrarium.botarium.common.fluid.base.FluidContainer;
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
 import earth.terrarium.botarium.common.fluid.base.PlatformFluidHandler;
 import earth.terrarium.botarium.common.fluid.utils.FluidHooks;
 import earth.terrarium.botarium.common.item.ItemStackHolder;
-import io.github.gregtechintergalactical.gtcore.machine.DrumMachine;
+import org.gtreimagined.gtcore.machine.DrumMachine;
 import muramasa.antimatter.Ref;
 import muramasa.antimatter.capability.fluid.FluidTank;
 import muramasa.antimatter.capability.fluid.FluidTanks;

diff --git a/...gtcore/blockentity/BlockEntityLocker.java → ...gtcore/blockentity/BlockEntityLocker.java b/...gtcore/blockentity/BlockEntityLocker.java → ...gtcore/blockentity/BlockEntityLocker.java
@@ -1,6 +1,6 @@
-package io.github.gregtechintergalactical.gtcore.blockentity;
+package org.gtreimagined.gtcore.blockentity;
 
-import io.github.gregtechintergalactical.gtcore.machine.MaterialMachine;
+import org.gtreimagined.gtcore.machine.MaterialMachine;
 import muramasa.antimatter.capability.machine.MachineCoverHandler;
 import muramasa.antimatter.cover.ICover;
 import muramasa.antimatter.gui.SlotType;

diff --git a/...e/blockentity/BlockEntityMassStorage.java → ...e/blockentity/BlockEntityMassStorage.java b/...e/blockentity/BlockEntityMassStorage.java → ...e/blockentity/BlockEntityMassStorage.java
@@ -1,13 +1,13 @@
-package io.github.gregtechintergalactical.gtcore.blockentity;
+package org.gtreimagined.gtcore.blockentity;
 
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
-import io.github.gregtechintergalactical.gtcore.data.GTCoreTools;
-import io.github.gregtechintergalactical.gtcore.data.SlotTypes;
-import io.github.gregtechintergalactical.gtcore.item.ItemTape;
-import io.github.gregtechintergalactical.gtcore.machine.MassStorageMachine;
-import io.github.gregtechintergalactical.gtcore.machine.MassStorageItemHandler;
-import io.github.gregtechintergalactical.gtcore.network.MessageInventorySync;
-import io.github.gregtechintergalactical.gtcore.network.MessageTriggerInventorySync;
+import org.gtreimagined.gtcore.data.GTCoreTools;
+import org.gtreimagined.gtcore.data.SlotTypes;
+import org.gtreimagined.gtcore.item.ItemTape;
+import org.gtreimagined.gtcore.machine.MassStorageMachine;
+import org.gtreimagined.gtcore.machine.MassStorageItemHandler;
+import org.gtreimagined.gtcore.network.MessageInventorySync;
+import org.gtreimagined.gtcore.network.MessageTriggerInventorySync;
 import muramasa.antimatter.Ref;
 import muramasa.antimatter.data.AntimatterDefaultTools;
 import muramasa.antimatter.gui.SlotType;

diff --git a/...core/blockentity/BlockEntityMaterial.java → ...core/blockentity/BlockEntityMaterial.java b/...core/blockentity/BlockEntityMaterial.java → ...core/blockentity/BlockEntityMaterial.java
@@ -1,6 +1,6 @@
-package io.github.gregtechintergalactical.gtcore.blockentity;
+package org.gtreimagined.gtcore.blockentity;
 
-import io.github.gregtechintergalactical.gtcore.machine.MaterialMachine;
+import org.gtreimagined.gtcore.machine.MaterialMachine;
 import muramasa.antimatter.blockentity.BlockEntityMachine;
 import muramasa.antimatter.material.Material;
 import net.minecraft.core.BlockPos;