Skip to content

Commit

Permalink
fixed compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Trinsdar committed Nov 5, 2024
1 parent c7adb44 commit 3ed8abb
Show file tree
Hide file tree
Showing 16 changed files with 4 additions and 37 deletions.
9 changes: 0 additions & 9 deletions common/src/main/java/org/gtreimagined/gt5r/GT5Reimagined.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package org.gtreimagined.gt5r;

import org.gtreimagined.gt5r.client.GT5RModelManager;
import gtreimagined.gt5r.data.*;
import gtreimagined.gt5r.datagen.*;
import org.gtreimagined.gt5r.data.*;
import org.gtreimagined.gt5r.datagen.*;
import org.gtreimagined.gt5r.loader.crafting.*;
Expand All @@ -12,7 +10,6 @@
import org.gtreimagined.gt5r.integration.AppliedEnergisticsRegistrar;
import org.gtreimagined.gt5r.integration.SpaceModRegistrar;
import org.gtreimagined.gt5r.integration.rei.REIRegistrar;
import org.gtreimagined.datagen.*;
import org.gtreimagined.gt5r.loader.machines.generator.Fuels;
import org.gtreimagined.gt5r.loader.machines.generator.LargeBoilerLoader;
import org.gtreimagined.gt5r.loader.machines.generator.SolidFuelBoilerLoader;
Expand All @@ -37,19 +34,13 @@
import muramasa.antimatter.tool.IAntimatterTool;
import muramasa.antimatter.util.AntimatterPlatformUtils;
import org.gtreimagined.gt5r.block.BlockAsphalt;
import muramasa.gt5r.data.*;
import muramasa.gt5r.datagen.*;
import muramasa.gt5r.loader.crafting.*;
import org.gtreimagined.gt5r.loader.items.Circuitry;
import muramasa.gt5r.loader.machines.*;
import muramasa.gt5r.loader.multi.*;
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.level.block.state.BlockState;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.gtreimagined.data.*;
import org.gtreimagined.gtcore.data.GTCoreItems;

import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.gtreimagined.gt5r.data;

import org.gtreimagined.gt5r.GT5RRef;
import gtreimagined.gt5r.block.*;
import muramasa.antimatter.AntimatterAPI;
import muramasa.antimatter.block.BlockBasic;
import muramasa.antimatter.data.AntimatterMaterials;
Expand All @@ -12,7 +11,6 @@
import muramasa.antimatter.pipe.types.ItemPipe;
import muramasa.antimatter.pipe.types.Wire;
import muramasa.antimatter.texture.Texture;
import muramasa.gt5r.block.*;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.ItemStack;
Expand All @@ -25,7 +23,6 @@
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import org.gtreimagined.block.*;
import org.gtreimagined.gt5r.block.*;

public class GT5RBlocks {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import earth.terrarium.botarium.common.fluid.base.PlatformFluidItemHandler;
import earth.terrarium.botarium.common.fluid.utils.FluidHooks;
import org.gtreimagined.gt5r.GT5RRef;
import gtreimagined.gt5r.cover.*;
import org.gtreimagined.gt5r.cover.*;
import org.gtreimagined.gt5r.cover.redstone.*;
import org.gtreimagined.gt5r.items.ItemCoverCustomTooltip;
Expand All @@ -13,13 +12,10 @@
import muramasa.antimatter.item.ItemCover;
import muramasa.antimatter.machine.Tier;
import muramasa.antimatter.texture.Texture;
import muramasa.gt5r.cover.*;
import muramasa.gt5r.cover.redstone.*;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.Tag;
import net.minecraft.world.item.ItemStack;
import org.gtreimagined.cover.*;
import tesseract.FluidPlatformUtils;

public class GT5RCovers {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@

import org.gtreimagined.gt5r.GT5RRef;
import org.gtreimagined.gt5r.GT5Reimagined;
import gtreimagined.gt5r.items.*;
import muramasa.antimatter.item.ItemBasic;
import muramasa.antimatter.item.ItemBattery;
import muramasa.antimatter.item.ItemFluidCell;
import muramasa.antimatter.machine.Tier;
import muramasa.gt5r.items.*;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.Item;
import org.gtreimagined.gt5r.items.*;
import org.gtreimagined.items.*;


public class GT5RItems {
public static ItemBasic<?> ComputerMonitor = new ItemBasic<>(GT5RRef.ID, "computer_monitor").tip("Can be placed on machines as a cover");
Expand Down
1 change: 0 additions & 1 deletion common/src/main/java/org/gtreimagined/gt5r/data/Guis.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import muramasa.antimatter.gui.widget.WidgetSupplier;
import muramasa.antimatter.machine.Tier;
import muramasa.antimatter.registration.Side;
import muramasa.gt5r.gui.widgets.*;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Inventory;
import org.gtreimagined.gt5r.gui.widgets.*;
Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/org/gtreimagined/gt5r/data/Machines.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
import muramasa.antimatter.texture.Texture;
import muramasa.antimatter.util.Utils;
import org.gtreimagined.gt5r.block.BlockCasing;
import muramasa.gt5r.blockentity.multi.*;
import muramasa.gt5r.blockentity.single.*;
import org.gtreimagined.gt5r.items.IItemReactorRod;
import net.minecraft.ChatFormatting;
import net.minecraft.core.BlockPos;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import muramasa.antimatter.structure.FakeTileElement;
import muramasa.antimatter.util.int3;
import org.gtreimagined.gt5r.block.BlockCoil;
import muramasa.gt5r.blockentity.multi.*;
import net.minecraft.core.BlockPos;
import net.minecraft.tags.BlockTags;
import net.minecraft.world.item.ItemStack;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.gtreimagined.gt5r.datagen;

import gtreimagined.gt5r.block.*;
import org.gtreimagined.gt5r.block.BlockAsphalt;
import org.gtreimagined.gt5r.block.BlockAsphaltSlab;
import org.gtreimagined.gt5r.block.BlockAsphaltStair;
Expand All @@ -15,14 +14,12 @@
import muramasa.antimatter.data.AntimatterStoneTypes;
import muramasa.antimatter.datagen.providers.AntimatterBlockLootProvider;
import muramasa.antimatter.ore.CobbleStoneType;
import muramasa.gt5r.block.*;
import org.gtreimagined.gt5r.data.GT5RBlocks;
import org.gtreimagined.gt5r.data.Materials;
import net.minecraft.data.loot.BlockLoot;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator;
import org.gtreimagined.block.*;

import static muramasa.antimatter.data.AntimatterMaterialTypes.RAW_ORE;
import static muramasa.antimatter.data.AntimatterMaterials.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package org.gtreimagined.gt5r.datagen;

import gtreimagined.gt5r.block.*;
import muramasa.antimatter.AntimatterAPI;
import muramasa.antimatter.data.AntimatterDefaultTools;
import muramasa.antimatter.datagen.providers.AntimatterBlockTagProvider;
import muramasa.antimatter.machine.Tier;
import org.gtreimagined.gt5r.GT5RRef;
import muramasa.gt5r.block.*;
import org.gtreimagined.gt5r.block.BlockAsphalt;
import org.gtreimagined.gt5r.block.BlockAsphaltSlab;
import org.gtreimagined.gt5r.block.BlockAsphaltStair;
Expand All @@ -18,7 +16,6 @@
import org.gtreimagined.gt5r.data.GT5RTags;
import org.gtreimagined.gt5r.data.Machines;
import net.minecraft.tags.BlockTags;
import org.gtreimagined.block.*;

import static muramasa.antimatter.data.AntimatterMaterials.Wood;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package org.gtreimagined.gt5r.datagen;


import gtreimagined.gt5r.block.*;
import muramasa.antimatter.AntimatterAPI;
import muramasa.antimatter.Ref;
import muramasa.antimatter.datagen.providers.AntimatterLanguageProvider;
import muramasa.antimatter.item.ItemBasic;
import muramasa.antimatter.util.Utils;
import org.gtreimagined.gt5r.GT5RRef;
import muramasa.gt5r.block.*;
import org.gtreimagined.gt5r.block.BlockAsphalt;
import org.gtreimagined.gt5r.block.BlockAsphaltSlab;
import org.gtreimagined.gt5r.block.BlockAsphaltStair;
Expand All @@ -21,7 +19,6 @@
import org.gtreimagined.gt5r.data.GT5RItems;
import org.gtreimagined.gt5r.items.ItemDepletedRod;
import org.gtreimagined.gt5r.items.ItemNuclearFuelRod;
import org.gtreimagined.block.*;

import static muramasa.antimatter.machine.Tier.*;
import static muramasa.antimatter.util.Utils.lowerUnderscoreToUpperSpaced;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.google.common.collect.ImmutableMap;
import org.gtreimagined.gt5r.GT5RRef;
import gtreimagined.gt5r.block.*;
import muramasa.antimatter.AntimatterAPI;
import muramasa.antimatter.data.AntimatterDefaultTools;
import muramasa.antimatter.data.AntimatterMaterialTypes;
Expand All @@ -13,7 +12,6 @@
import muramasa.antimatter.pipe.PipeSize;
import muramasa.antimatter.pipe.types.PipeType;
import muramasa.antimatter.util.AntimatterPlatformUtils;
import muramasa.gt5r.block.*;
import org.gtreimagined.gt5r.data.GT5RBlocks;
import org.gtreimagined.gt5r.data.GT5RTags;
import net.minecraft.data.recipes.FinishedRecipe;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.gtreimagined.gt5r.GT5RConfig;
import org.gtreimagined.gt5r.GT5RRef;
import org.gtreimagined.gt5r.GT5Reimagined;
import gtreimagined.gt5r.data.*;
import org.gtreimagined.gt5r.machine.MultiblockTankMachine;
import muramasa.antimatter.AntimatterAPI;
import muramasa.antimatter.Ref;
Expand All @@ -19,7 +18,6 @@
import muramasa.antimatter.material.MaterialTags;
import muramasa.antimatter.pipe.PipeSize;
import muramasa.antimatter.pipe.types.Wire;
import muramasa.gt5r.data.*;
import net.minecraft.data.recipes.FinishedRecipe;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.gtreimagined.gt5r.block.BlockCasing;
import org.gtreimagined.gt5r.block.BlockCoil;
import org.gtreimagined.gt5r.block.BlockColoredWall;
import muramasa.gt5r.data.*;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import static muramasa.antimatter.data.AntimatterMaterials.*;
import static muramasa.antimatter.material.MaterialTags.MACERATE_INTO;
import static muramasa.antimatter.material.MaterialTags.ORE_MULTI;
import static org.gtreimagined.gt5r.data.Materials.*;
import static org.gtreimagined.gt5r.data.RecipeMaps.FLUID_PRESS;
import static net.dries007.tfc.common.blocks.rock.Ore.*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST;
import static net.dries007.tfc.common.blocks.soil.SoilBlockType.GRASS_PATH;
import static org.gtreimagined.gt5r.data.Materials.*;

public class TFCRegistrar implements IAntimatterRegistrar {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import static muramasa.antimatter.data.AntimatterDefaultTools.*;
import static muramasa.antimatter.data.AntimatterMaterials.Copper;
import static org.gtreimagined.gt5r.data.Materials.*;

public class TFCItemTagProvider extends AntimatterItemTagProvider {
public TFCItemTagProvider(String providerDomain, String providerName, boolean replace, AntimatterBlockTagProvider p) {
Expand Down

0 comments on commit 3ed8abb

Please sign in to comment.