Skip to content

Commit

Permalink
move bartworks and bwcrossmod
Browse files Browse the repository at this point in the history
  • Loading branch information
NotAPenguin0 committed Sep 1, 2024
1 parent a8250a0 commit 1f3f59a
Show file tree
Hide file tree
Showing 16 changed files with 37 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import static gregtech.api.enums.Mods.Botania;
import static gregtech.api.enums.Mods.IndustrialCraft2;

import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass;
import bartworks.API.BorosilicateGlass;

import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.dreammaster.bartworksHandler;

import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes;
import static com.github.bartimaeusnek.bartworks.util.BWRecipes.calcDecayTicks;
import static bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes;
import static bartworks.util.BWRecipes.calcDecayTicks;
import static gregtech.api.util.GT_RecipeConstants.DECAY_TICKS;

import net.minecraft.item.ItemStack;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.dreammaster.bartworksHandler;

import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Ruridit;
import static bartworks.system.material.WerkstoffLoader.Ruridit;
import static gregtech.api.enums.Mods.GalacticraftMars;
import static gregtech.api.enums.OrePrefixes.bolt;
import static gregtech.api.enums.OrePrefixes.dustTiny;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.dreammaster.bartworksHandler;

import static com.dreammaster.gthandler.GT_CoreModSupport.*;
import static com.github.bartimaeusnek.bartworks.API.BioObjectAdder.*;
import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes;
import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.bioLabRecipes;
import static com.github.bartimaeusnek.bartworks.util.BWRecipes.computeSieverts;
import static bartworks.API.BioObjectAdder.*;
import static bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes;
import static bartworks.API.recipe.BartWorksRecipeMaps.bioLabRecipes;
import static bartworks.util.BWRecipes.computeSieverts;
import static gregtech.api.enums.Materials.*;
import static gregtech.api.enums.Mods.GalaxySpace;
import static gregtech.api.enums.Mods.Genetics;
Expand All @@ -26,6 +26,10 @@
import java.awt.Color;
import java.util.LinkedHashMap;

import bartworks.util.BioCulture;
import bartworks.util.BioDNA;
import bartworks.util.BioData;
import bartworks.util.BioPlasmid;
import net.minecraft.init.Items;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
Expand All @@ -34,11 +38,7 @@

import com.dreammaster.fluids.FluidList;
import com.dreammaster.gthandler.CustomItemList;
import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList;
import com.github.bartimaeusnek.bartworks.util.BioCulture;
import com.github.bartimaeusnek.bartworks.util.BioDNA;
import com.github.bartimaeusnek.bartworks.util.BioData;
import com.github.bartimaeusnek.bartworks.util.BioPlasmid;
import bartworks.common.loaders.BioItemList;

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import java.util.Optional;

import com.github.bartimaeusnek.bartworks.API.VoidMinerDropAdder;
import com.github.bartimaeusnek.bartworks.API.WerkstoffAPI;
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
import bartworks.API.VoidMinerDropAdder;
import bartworks.API.WerkstoffAPI;
import bartworks.system.material.Werkstoff;

import gregtech.api.enums.Materials;
import gregtech.api.interfaces.ISubTagContainer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.dreammaster.bartworksHandler;

import static com.dreammaster.bartworksHandler.BacteriaRegistry.CultureSet;
import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes;
import static com.github.bartimaeusnek.bartworks.util.BWRecipes.computeSieverts;
import static bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes;
import static bartworks.util.BWRecipes.computeSieverts;
import static gregtech.api.enums.GT_Values.*;
import static gregtech.api.enums.Mods.BartWorks;
import static gregtech.api.enums.Mods.PamsHarvestCraft;
Expand All @@ -23,9 +23,9 @@
import net.minecraftforge.oredict.OreDictionary;

import com.dreammaster.main.MainRegistry;
import com.github.bartimaeusnek.bartworks.MainMod;
import com.github.bartimaeusnek.bartworks.common.items.SimpleSubItemClass;
import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList;
import bartworks.MainMod;
import bartworks.common.items.SimpleSubItemClass;
import bartworks.common.loaders.BioItemList;

import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.GT_Values;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
import com.github.bartimaeusnek.crossmod.galacticgreg.VoidMinerUtility;
import bartworks.system.material.Werkstoff;
import bwcrossmod.galacticgreg.VoidMinerUtility;
import com.google.common.collect.Maps;

import cpw.mods.fml.common.registry.GameRegistry;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/config/CoreModConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ protected void Init() {
"WerkstoffWeights",
"DeepDarkVoidMiner",
WerkstoffWeights,
"List of BartWorks material names to adjust weight. Example line: \"Bismutite : 0.3\". Intervening whitespace will be ignored. Use the debug options to get valid names. Use weight <= 0 to disable an ore entirely. Anything not specified in the list will have weight 1. See: com.github.bartimaeusnek.bartworks.system.material.Werkstoff");
"List of BartWorks material names to adjust weight. Example line: \"Bismutite : 0.3\". Intervening whitespace will be ignored. Use the debug options to get valid names. Use weight <= 0 to disable an ore entirely. Anything not specified in the list will have weight 1. See: bartworks.system.material.Werkstoff");
GTPPMaterialWeights = _mainConfig.getStringList(
"GTPPMaterialWeights",
"DeepDarkVoidMiner",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
import com.dreammaster.main.NHItems;
import com.dreammaster.mantle.MantleManualRecipeRegistry;
import com.dreammaster.recipes.Recipe;
import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import bartworks.common.loaders.ItemRegistry;
import bartworks.system.material.WerkstoffLoader;

import goodgenerator.items.MyMaterial;
import gregtech.api.enums.Dyes;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.dreammaster.gthandler.recipes;

import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.LuVTierMaterial;
import static bartworks.system.material.WerkstoffLoader.LuVTierMaterial;
import static gregtech.api.enums.GT_Values.W;
import static gregtech.api.enums.Mods.*;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
Expand Down Expand Up @@ -31,8 +31,8 @@
import net.minecraftforge.oredict.OreDictionary;

import com.dreammaster.gthandler.CustomItemList;
import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import bartworks.common.loaders.ItemRegistry;
import bartworks.system.material.WerkstoffLoader;

import goodgenerator.items.MyMaterial;
import goodgenerator.loader.Loaders;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.dreammaster.gthandler.recipes;

import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Californium;
import static bartworks.system.material.WerkstoffLoader.Californium;
import static gregtech.api.enums.Mods.AE2FluidCraft;
import static gregtech.api.enums.Mods.AppliedEnergistics2;
import static gregtech.api.enums.Mods.Computronics;
Expand Down Expand Up @@ -40,7 +40,7 @@
import net.minecraftforge.fluids.FluidStack;

import com.dreammaster.gthandler.CustomItemList;
import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
import bartworks.common.loaders.ItemRegistry;

import appeng.api.AEApi;
import goodgenerator.items.MyMaterial;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import net.minecraftforge.fluids.FluidStack;

import com.dreammaster.gthandler.CustomItemList;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import bartworks.system.material.WerkstoffLoader;

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/main/MainRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
import com.dreammaster.thaumcraft.TCLoader;
import com.dreammaster.tinkersConstruct.TiCoLoader;
import com.dreammaster.witchery.WitcheryPlugin;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import bartworks.system.material.WerkstoffLoader;

import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/scripts/ScriptEnderIO.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.dreammaster.scripts;

import static com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry.bw_realglas;
import static bartworks.common.loaders.ItemRegistry.bw_realglas;
import static gregtech.api.enums.Mods.AppliedEnergistics2;
import static gregtech.api.enums.Mods.Avaritia;
import static gregtech.api.enums.Mods.Backpack;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import net.minecraftforge.fluids.FluidStack;

import com.dreammaster.gthandler.CustomItemList;
import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
import bartworks.common.loaders.ItemRegistry;

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.dreammaster.scripts;

import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Fluorspar;
import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.RedZircon;
import static bartworks.system.material.WerkstoffLoader.Fluorspar;
import static bartworks.system.material.WerkstoffLoader.RedZircon;
import static gregtech.api.enums.Mods.Backpack;
import static gregtech.api.enums.Mods.BartWorks;
import static gregtech.api.enums.Mods.BiomesOPlenty;
Expand Down

0 comments on commit 1f3f59a

Please sign in to comment.