diff --git a/src/main/java/com/dreammaster/bartworksHandler/BWGlassAdder.java b/src/main/java/com/dreammaster/bartworksHandler/BWGlassAdder.java index f30fc3a83..b86be4530 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BWGlassAdder.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BWGlassAdder.java @@ -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; diff --git a/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java b/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java index d6b4ada75..9c4d59c14 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java @@ -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; diff --git a/src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java b/src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java index 20b7a9f10..6b735027d 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java @@ -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; diff --git a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java index 72c90d67b..98e2a84cd 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java @@ -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; @@ -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; @@ -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; diff --git a/src/main/java/com/dreammaster/bartworksHandler/BartWorksMaterials.java b/src/main/java/com/dreammaster/bartworksHandler/BartWorksMaterials.java index 543432eb1..189cf8da5 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BartWorksMaterials.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BartWorksMaterials.java @@ -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; diff --git a/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java b/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java index ac8d25d5f..a9008c76f 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java @@ -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; @@ -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; diff --git a/src/main/java/com/dreammaster/bartworksHandler/VoidMinerLoader.java b/src/main/java/com/dreammaster/bartworksHandler/VoidMinerLoader.java index f9e818130..fa4ee3ff3 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/VoidMinerLoader.java +++ b/src/main/java/com/dreammaster/bartworksHandler/VoidMinerLoader.java @@ -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; diff --git a/src/main/java/com/dreammaster/config/CoreModConfig.java b/src/main/java/com/dreammaster/config/CoreModConfig.java index 104b0a472..2143e3ac5 100644 --- a/src/main/java/com/dreammaster/config/CoreModConfig.java +++ b/src/main/java/com/dreammaster/config/CoreModConfig.java @@ -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", diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index a56fcf06c..522bdf4d7 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -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; diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index b758d0497..c0580205e 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -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; @@ -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; diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index d2b704576..30a2064e3 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -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; @@ -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; diff --git a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java index b66ea8552..354846b23 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java @@ -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; diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java index f93cf786f..961917f5d 100644 --- a/src/main/java/com/dreammaster/main/MainRegistry.java +++ b/src/main/java/com/dreammaster/main/MainRegistry.java @@ -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; diff --git a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java index 2d88e662f..fb4167465 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java @@ -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; diff --git a/src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java b/src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java index 207c3fe0c..a95f46a79 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java +++ b/src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java @@ -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; diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java b/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java index f9227d824..ba501995c 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java @@ -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;