diff options
| author | Robert Sosnitzka <robert.sosnitzka@gmail.com> | 2016-07-18 16:04:36 +0200 |
|---|---|---|
| committer | Robert Sosnitzka <robert.sosnitzka@gmail.com> | 2016-07-18 16:04:37 +0200 |
| commit | 7515737cb4c6bd9a98d0ebeecd5715c808f87e3f (patch) | |
| tree | 13dac154e10091769986b489468af2995e4b17c9 /src/main/java/com/sosnitzka | |
| parent | c72689b68ae16da380d29ff424038bba393cd340 (diff) | |
Project renamed to "TAIGA: Tinkers alloying addon"
Diffstat (limited to 'src/main/java/com/sosnitzka')
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/Alloys.java (renamed from src/main/java/com/sosnitzka/ztic_addon/Alloys.java) | 6 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/Blocks.java (renamed from src/main/java/com/sosnitzka/ztic_addon/Blocks.java) | 16 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/Fluids.java (renamed from src/main/java/com/sosnitzka/ztic_addon/Fluids.java) | 16 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/Items.java (renamed from src/main/java/com/sosnitzka/ztic_addon/Items.java) | 16 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/MaterialTraits.java (renamed from src/main/java/com/sosnitzka/ztic_addon/MaterialTraits.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/TAIGA.java (renamed from src/main/java/com/sosnitzka/ztic_addon/ZTiC.java) | 26 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java (renamed from src/main/java/com/sosnitzka/ztic_addon/blocks/BlockLignite.java) | 6 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java (renamed from src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java) | 8 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/generic/BasicBlock.java (renamed from src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlock.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/generic/BasicBlockGround.java (renamed from src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockGround.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/generic/BasicItem.java (renamed from src/main/java/com/sosnitzka/ztic_addon/generic/BasicItem.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/generic/BasicTinkerFluid.java (renamed from src/main/java/com/sosnitzka/ztic_addon/generic/BasicTinkerFluid.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/items/ItemIronNugget.java (renamed from src/main/java/com/sosnitzka/ztic_addon/items/ItemIronNugget.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/items/ItemLignite.java (renamed from src/main/java/com/sosnitzka/ztic_addon/items/ItemLignite.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/items/ItemSlaggoldIngot.java (renamed from src/main/java/com/sosnitzka/ztic_addon/items/ItemSlaggoldIngot.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/items/ItemSlagironIngot.java (renamed from src/main/java/com/sosnitzka/ztic_addon/items/ItemSlagironIngot.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java (renamed from src/main/java/com/sosnitzka/ztic_addon/proxy/ClientProxy.java) | 18 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/proxy/ServerProxy.java (renamed from src/main/java/com/sosnitzka/ztic_addon/proxy/ServerProxy.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/recipes/Crafting.java (renamed from src/main/java/com/sosnitzka/ztic_addon/recipes/Crafting.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/recipes/Smelting.java (renamed from src/main/java/com/sosnitzka/ztic_addon/recipes/Smelting.java) | 6 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitAnalysing.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitArcane.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitBlind.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitBright.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitBright.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitCascade.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitCurvature.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitDark.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitDark.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitDiffuse.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitDissolving.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitFracture.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitFragile.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitGarishly.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitGlimmer.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitHaunted.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitHaunted.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitHeroic.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitHollow.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitInstable.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitMelting.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitNatureBound.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitOrganizing.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitOrganizing.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitPulverizing.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitPulverizing.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitRandomize.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitRandomize.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitResonance.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitReviving.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitSlaughtering.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitSofty.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java (renamed from src/main/java/com/sosnitzka/ztic_addon/traits/TraitUncertain.java) | 6 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/util/EntityAIPermanentPanic.java (renamed from src/main/java/com/sosnitzka/ztic_addon/util/EntityAIPermanentPanic.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/util/FuelHandler.java (renamed from src/main/java/com/sosnitzka/ztic_addon/util/FuelHandler.java) | 8 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/util/Generator.java (renamed from src/main/java/com/sosnitzka/ztic_addon/util/Generator.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/util/StateMatcher.java (renamed from src/main/java/com/sosnitzka/ztic_addon/util/StateMatcher.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/util/Utils.java (renamed from src/main/java/com/sosnitzka/ztic_addon/util/Utils.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java (renamed from src/main/java/com/sosnitzka/ztic_addon/world/ZWorldGen.java) | 6 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/world/ZWorldGenMinable.java (renamed from src/main/java/com/sosnitzka/ztic_addon/world/ZWorldGenMinable.java) | 6 |
54 files changed, 124 insertions, 122 deletions
diff --git a/src/main/java/com/sosnitzka/ztic_addon/Alloys.java b/src/main/java/com/sosnitzka/taiga/Alloys.java index c876f2f..0528f3a 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Alloys.java +++ b/src/main/java/com/sosnitzka/taiga/Alloys.java @@ -1,10 +1,10 @@ -package com.sosnitzka.ztic_addon; +package com.sosnitzka.taiga; import net.minecraftforge.fluids.FluidRegistry; -import static com.sosnitzka.ztic_addon.Fluids.*; -import static com.sosnitzka.ztic_addon.util.Utils.registerTinkerAlloys; +import static com.sosnitzka.taiga.Fluids.*; +import static com.sosnitzka.taiga.util.Utils.registerTinkerAlloys; public class Alloys { diff --git a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java index e11703d..014b9bf 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java +++ b/src/main/java/com/sosnitzka/taiga/Blocks.java @@ -1,11 +1,11 @@ -package com.sosnitzka.ztic_addon; +package com.sosnitzka.taiga; import com.google.common.base.Joiner; -import com.sosnitzka.ztic_addon.blocks.BlockLignite; -import com.sosnitzka.ztic_addon.blocks.BlockTiberium; -import com.sosnitzka.ztic_addon.generic.BasicBlock; -import com.sosnitzka.ztic_addon.generic.BasicBlockGround; -import com.sosnitzka.ztic_addon.util.Utils; +import com.sosnitzka.taiga.blocks.BlockLignite; +import com.sosnitzka.taiga.blocks.BlockTiberium; +import com.sosnitzka.taiga.generic.BasicBlock; +import com.sosnitzka.taiga.generic.BasicBlockGround; +import com.sosnitzka.taiga.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraftforge.oredict.OreDictionary; @@ -14,8 +14,8 @@ import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; import java.util.Arrays; -import static com.sosnitzka.ztic_addon.MaterialTraits.*; -import static com.sosnitzka.ztic_addon.util.Utils.*; +import static com.sosnitzka.taiga.MaterialTraits.*; +import static com.sosnitzka.taiga.util.Utils.*; import static slimeknights.tconstruct.library.utils.HarvestLevels.*; public class Blocks { diff --git a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java b/src/main/java/com/sosnitzka/taiga/Fluids.java index 7cbb2b3..2d08473 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java +++ b/src/main/java/com/sosnitzka/taiga/Fluids.java @@ -1,16 +1,16 @@ -package com.sosnitzka.ztic_addon; +package com.sosnitzka.taiga; -import com.sosnitzka.ztic_addon.generic.BasicTinkerFluid; -import com.sosnitzka.ztic_addon.util.Utils; +import com.sosnitzka.taiga.generic.BasicTinkerFluid; +import com.sosnitzka.taiga.util.Utils; import net.minecraft.init.Blocks; import net.minecraftforge.fluids.FluidRegistry; import slimeknights.tconstruct.smeltery.block.BlockMolten; import java.lang.reflect.Field; -import static com.sosnitzka.ztic_addon.Items.*; -import static com.sosnitzka.ztic_addon.util.Utils.registerFluid; +import static com.sosnitzka.taiga.Items.*; +import static com.sosnitzka.taiga.util.Utils.registerFluid; import static slimeknights.tconstruct.library.TinkerRegistry.registerMelting; public class Fluids { @@ -24,7 +24,7 @@ public class Fluids { public static BasicTinkerFluid ignititeFluid = new BasicTinkerFluid("ignitite", 0xFFff6642, true, 422, 9, 3787); public static BasicTinkerFluid karmesineFluid = new BasicTinkerFluid("karmesine", 0xFFc16d6d, true, 499, 7, 3978); public static BasicTinkerFluid meteoriteFluid = new BasicTinkerFluid("meteorite", 0xFF6e6a62, true, 942, 10, 2588); - public static BasicTinkerFluid mindoriteFluid = new BasicTinkerFluid("mindorite", 0xFF6bbbf, true, 671, 8, 2956); + public static BasicTinkerFluid mindoriteFluid = new BasicTinkerFluid("mindorite", 0xFF6bbbff, true, 671, 8, 2956); public static BasicTinkerFluid mythrilFluid = new BasicTinkerFluid("mythril", 0xFFa8c0ba, true, 841, 10, 1579); public static BasicTinkerFluid palladiumFluid = new BasicTinkerFluid("palladium", 0xFFfe5c05, true, 786, 10, 3302); public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum", 0xFF2b282f, true, 786, 2, 2256); @@ -70,10 +70,10 @@ public class Fluids { BlockMolten block = new BlockMolten(fluid); block.setUnlocalizedName("molten_" + fluid.getName()); - block.setRegistryName(ZTiC.MODID, "molten_" + fluid.getName()); + block.setRegistryName(TAIGA.MODID, "molten_" + fluid.getName()); Utils.registerBlockWithItem(block); - ZTiC.proxy.registerFluidModels(fluid); + TAIGA.proxy.registerFluidModels(fluid); } catch (IllegalAccessException e) { e.printStackTrace(); } diff --git a/src/main/java/com/sosnitzka/ztic_addon/Items.java b/src/main/java/com/sosnitzka/taiga/Items.java index 9187542..37e36e4 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Items.java +++ b/src/main/java/com/sosnitzka/taiga/Items.java @@ -1,12 +1,12 @@ -package com.sosnitzka.ztic_addon; +package com.sosnitzka.taiga; import com.google.common.base.Joiner; -import com.sosnitzka.ztic_addon.generic.BasicItem; -import com.sosnitzka.ztic_addon.items.ItemIronNugget; -import com.sosnitzka.ztic_addon.items.ItemLignite; -import com.sosnitzka.ztic_addon.items.ItemSlaggoldIngot; -import com.sosnitzka.ztic_addon.items.ItemSlagironIngot; +import com.sosnitzka.taiga.generic.BasicItem; +import com.sosnitzka.taiga.items.ItemIronNugget; +import com.sosnitzka.taiga.items.ItemLignite; +import com.sosnitzka.taiga.items.ItemSlaggoldIngot; +import com.sosnitzka.taiga.items.ItemSlagironIngot; import net.minecraft.item.Item; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; @@ -15,8 +15,8 @@ import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; import java.util.Arrays; -import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_INGOT; -import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_NUGGET; +import static com.sosnitzka.taiga.util.Utils.PREFIX_INGOT; +import static com.sosnitzka.taiga.util.Utils.PREFIX_NUGGET; public class Items { public static ItemSlagironIngot slagironIngot = new ItemSlagironIngot(); diff --git a/src/main/java/com/sosnitzka/ztic_addon/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index 1f8c3ae..f0e8b4b 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -1,7 +1,7 @@ -package com.sosnitzka.ztic_addon; +package com.sosnitzka.taiga; -import com.sosnitzka.ztic_addon.traits.*; +import com.sosnitzka.taiga.traits.*; import net.minecraft.util.text.TextFormatting; import slimeknights.tconstruct.library.materials.HandleMaterialStats; import slimeknights.tconstruct.library.materials.HeadMaterialStats; diff --git a/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java index 1e0f11f..4f773aa 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java @@ -1,11 +1,11 @@ -package com.sosnitzka.ztic_addon; +package com.sosnitzka.taiga; import com.google.common.collect.Lists; -import com.sosnitzka.ztic_addon.proxy.ServerProxy; -import com.sosnitzka.ztic_addon.recipes.Crafting; -import com.sosnitzka.ztic_addon.recipes.Smelting; -import com.sosnitzka.ztic_addon.util.FuelHandler; -import com.sosnitzka.ztic_addon.world.ZWorldGen; +import com.sosnitzka.taiga.proxy.ServerProxy; +import com.sosnitzka.taiga.recipes.Crafting; +import com.sosnitzka.taiga.recipes.Smelting; +import com.sosnitzka.taiga.util.FuelHandler; +import com.sosnitzka.taiga.world.ZWorldGen; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -23,17 +23,19 @@ import slimeknights.tconstruct.tools.TinkerMaterials; import java.util.List; -import static com.sosnitzka.ztic_addon.Fluids.*; -import static com.sosnitzka.ztic_addon.MaterialTraits.*; +import static com.sosnitzka.taiga.Fluids.*; +import static com.sosnitzka.taiga.MaterialTraits.*; import static slimeknights.tconstruct.library.utils.HarvestLevels.*; -@Mod(modid = ZTiC.MODID, version = ZTiC.VERSION) -public class ZTiC { +@Mod(modid = TAIGA.MODID, version = TAIGA.VERSION) - public static final String MODID = "ztic_addon"; + +public class TAIGA { + + public static final String MODID = "taiga"; public static final String VERSION = "@VERSION@"; - @SidedProxy(clientSide = "com.sosnitzka.ztic_addon.proxy.ClientProxy", serverSide = "com.sosnitzka.ztic_addon.proxy.ServerProxy") + @SidedProxy(clientSide = "com.sosnitzka.taiga.proxy.ClientProxy", serverSide = "com.sosnitzka.taiga.proxy.ServerProxy") public static ServerProxy proxy; private List<MaterialIntegration> integrateList = Lists.newArrayList(); diff --git a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockLignite.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java index cdcb9fc..a524024 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockLignite.java +++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java @@ -1,6 +1,6 @@ -package com.sosnitzka.ztic_addon.blocks; +package com.sosnitzka.taiga.blocks; -import com.sosnitzka.ztic_addon.generic.BasicBlock; +import com.sosnitzka.taiga.generic.BasicBlock; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; @@ -11,7 +11,7 @@ import net.minecraft.world.World; import java.util.Random; -import static com.sosnitzka.ztic_addon.Items.lignite; +import static com.sosnitzka.taiga.Items.lignite; public class BlockLignite extends BasicBlock { diff --git a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java index c5dd17c..bd7d504 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java +++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java @@ -1,7 +1,7 @@ -package com.sosnitzka.ztic_addon.blocks; +package com.sosnitzka.taiga.blocks; -import com.sosnitzka.ztic_addon.Items; -import com.sosnitzka.ztic_addon.generic.BasicBlock; +import com.sosnitzka.taiga.Items; +import com.sosnitzka.taiga.generic.BasicBlock; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; @@ -13,7 +13,7 @@ import net.minecraft.world.World; import java.util.Random; -import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_ORE; +import static com.sosnitzka.taiga.util.Utils.PREFIX_ORE; import static slimeknights.tconstruct.TConstruct.random; import static slimeknights.tconstruct.library.utils.HarvestLevels.OBSIDIAN; diff --git a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlock.java b/src/main/java/com/sosnitzka/taiga/generic/BasicBlock.java index 425178f..7b03903 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlock.java +++ b/src/main/java/com/sosnitzka/taiga/generic/BasicBlock.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.generic; +package com.sosnitzka.taiga.generic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockGround.java b/src/main/java/com/sosnitzka/taiga/generic/BasicBlockGround.java index dba47b9..17cf8fc 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockGround.java +++ b/src/main/java/com/sosnitzka/taiga/generic/BasicBlockGround.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.generic; +package com.sosnitzka.taiga.generic; import net.minecraft.block.Block; import net.minecraft.block.SoundType; diff --git a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicItem.java b/src/main/java/com/sosnitzka/taiga/generic/BasicItem.java index fd32899..4197e45 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicItem.java +++ b/src/main/java/com/sosnitzka/taiga/generic/BasicItem.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.generic; +package com.sosnitzka.taiga.generic; import net.minecraft.item.Item; diff --git a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicTinkerFluid.java b/src/main/java/com/sosnitzka/taiga/generic/BasicTinkerFluid.java index fd47acc..475fc7a 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicTinkerFluid.java +++ b/src/main/java/com/sosnitzka/taiga/generic/BasicTinkerFluid.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.generic; +package com.sosnitzka.taiga.generic; import net.minecraft.util.ResourceLocation; import slimeknights.tconstruct.library.Util; diff --git a/src/main/java/com/sosnitzka/ztic_addon/items/ItemIronNugget.java b/src/main/java/com/sosnitzka/taiga/items/ItemIronNugget.java index 8b396e4..d9e2463 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/items/ItemIronNugget.java +++ b/src/main/java/com/sosnitzka/taiga/items/ItemIronNugget.java @@ -1,6 +1,6 @@ -package com.sosnitzka.ztic_addon.items; +package com.sosnitzka.taiga.items; -import com.sosnitzka.ztic_addon.generic.BasicItem; +import com.sosnitzka.taiga.generic.BasicItem; public class ItemIronNugget extends BasicItem { diff --git a/src/main/java/com/sosnitzka/ztic_addon/items/ItemLignite.java b/src/main/java/com/sosnitzka/taiga/items/ItemLignite.java index d734e29..5de29fb 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/items/ItemLignite.java +++ b/src/main/java/com/sosnitzka/taiga/items/ItemLignite.java @@ -1,6 +1,6 @@ -package com.sosnitzka.ztic_addon.items; +package com.sosnitzka.taiga.items; -import com.sosnitzka.ztic_addon.generic.BasicItem; +import com.sosnitzka.taiga.generic.BasicItem; public class ItemLignite extends BasicItem { diff --git a/src/main/java/com/sosnitzka/ztic_addon/items/ItemSlaggoldIngot.java b/src/main/java/com/sosnitzka/taiga/items/ItemSlaggoldIngot.java index 996c32d..ee3c685 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/items/ItemSlaggoldIngot.java +++ b/src/main/java/com/sosnitzka/taiga/items/ItemSlaggoldIngot.java @@ -1,6 +1,6 @@ -package com.sosnitzka.ztic_addon.items; +package com.sosnitzka.taiga.items; -import com.sosnitzka.ztic_addon.generic.BasicItem; +import com.sosnitzka.taiga.generic.BasicItem; public class ItemSlaggoldIngot extends BasicItem { diff --git a/src/main/java/com/sosnitzka/ztic_addon/items/ItemSlagironIngot.java b/src/main/java/com/sosnitzka/taiga/items/ItemSlagironIngot.java index e76e9aa..b3d08a9 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/items/ItemSlagironIngot.java +++ b/src/main/java/com/sosnitzka/taiga/items/ItemSlagironIngot.java @@ -1,6 +1,6 @@ -package com.sosnitzka.ztic_addon.items; +package com.sosnitzka.taiga.items; -import com.sosnitzka.ztic_addon.generic.BasicItem; +import com.sosnitzka.taiga.generic.BasicItem; public class ItemSlagironIngot extends BasicItem { diff --git a/src/main/java/com/sosnitzka/ztic_addon/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java index 81e3982..5ca41a9 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/proxy/ClientProxy.java +++ b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java @@ -1,8 +1,8 @@ -package com.sosnitzka.ztic_addon.proxy; +package com.sosnitzka.taiga.proxy; -import com.sosnitzka.ztic_addon.Blocks; -import com.sosnitzka.ztic_addon.Items; -import com.sosnitzka.ztic_addon.ZTiC; +import com.sosnitzka.taiga.Blocks; +import com.sosnitzka.taiga.Items; +import com.sosnitzka.taiga.TAIGA; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -22,7 +22,7 @@ import slimeknights.tconstruct.library.materials.Material; import javax.annotation.Nonnull; import java.lang.reflect.Field; -import static com.sosnitzka.ztic_addon.MaterialTraits.*; +import static com.sosnitzka.taiga.MaterialTraits.*; public class ClientProxy extends ServerProxy { @@ -68,7 +68,7 @@ public class ClientProxy extends ServerProxy { public void setRenderInfo(final Material material) { /* if (material != bismuth) { material.setRenderInfo(new MaterialRenderInfo.Metal(fluid.getColor(), 0.4f, 0.2f, 0f)); - } else bismuth.setRenderInfo(new MaterialRenderInfo.BlockTexture("ztic_addon:blocks/bismuth_block")); */ + } else bismuth.setRenderInfo(new MaterialRenderInfo.BlockTexture("taiga:blocks/bismuth_block")); */ if (material == adamantite) renderTo(material, 0xd55cdf, 0.5f, 0.8f, 0.2f); else if (material == solarium) renderTo(material, 0xffff00, 0.6f, 1.8f, 0.0f); @@ -77,7 +77,7 @@ public class ClientProxy extends ServerProxy { else if (material == bismuth) renderTo(material, 0xffffff, 0.4f, 0.2f, 0.0f); else if (material == dyonite) renderTo(material, 0xffe240, 0.6f, 0.8f, 0.2f); else { - material.setRenderInfo(new MaterialRenderInfo.BlockTexture("ztic_addon:blocks/" + material.getFluid().getName() + "_block")); + material.setRenderInfo(new MaterialRenderInfo.BlockTexture("taiga:blocks/" + material.getFluid().getName() + "_block")); } } @@ -85,7 +85,7 @@ public class ClientProxy extends ServerProxy { material.setRenderInfo(new MaterialRenderInfo.AbstractMaterialRenderInfo() { @Override public TextureAtlasSprite getTexture(TextureAtlasSprite baseTexture, String location) { - return new MetalTextureTexture("ztic_addon:blocks/materials/adamantite", baseTexture, location, f, shine, brightness, hueshift); + return new MetalTextureTexture("taiga:blocks/materials/adamantite", baseTexture, location, f, shine, brightness, hueshift); } }); } @@ -120,7 +120,7 @@ public class ClientProxy extends ServerProxy { this.fluid = fluid; // have each block hold its fluid per nbt? hm - this.location = new ModelResourceLocation(new ResourceLocation(ZTiC.MODID, "fluid_block"), fluid.getName()); + this.location = new ModelResourceLocation(new ResourceLocation(TAIGA.MODID, "fluid_block"), fluid.getName()); } @Nonnull diff --git a/src/main/java/com/sosnitzka/ztic_addon/proxy/ServerProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ServerProxy.java index e512442..460c920 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/proxy/ServerProxy.java +++ b/src/main/java/com/sosnitzka/taiga/proxy/ServerProxy.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.proxy; +package com.sosnitzka.taiga.proxy; import net.minecraftforge.fluids.Fluid; import slimeknights.tconstruct.library.materials.Material; diff --git a/src/main/java/com/sosnitzka/ztic_addon/recipes/Crafting.java b/src/main/java/com/sosnitzka/taiga/recipes/Crafting.java index acebee3..b0fdbe4 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/recipes/Crafting.java +++ b/src/main/java/com/sosnitzka/taiga/recipes/Crafting.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.recipes; +package com.sosnitzka.taiga.recipes; import net.minecraft.init.Blocks; @@ -7,7 +7,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; -import static com.sosnitzka.ztic_addon.Items.*; +import static com.sosnitzka.taiga.Items.*; import static slimeknights.tconstruct.shared.TinkerCommons.matNecroticBone; public class Crafting { diff --git a/src/main/java/com/sosnitzka/ztic_addon/recipes/Smelting.java b/src/main/java/com/sosnitzka/taiga/recipes/Smelting.java index 91b07b2..880583c 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/recipes/Smelting.java +++ b/src/main/java/com/sosnitzka/taiga/recipes/Smelting.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.recipes; +package com.sosnitzka.taiga.recipes; import net.minecraft.init.Items; @@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; import org.apache.commons.lang3.RandomUtils; -import static com.sosnitzka.ztic_addon.Blocks.*; -import static com.sosnitzka.ztic_addon.Items.*; +import static com.sosnitzka.taiga.Blocks.*; +import static com.sosnitzka.taiga.Items.*; public class Smelting { public static void register() { diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitAnalysing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java index 5a02bc2..9ff620a 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitAnalysing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitArcane.java b/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java index 639ad1a..7d67f8d 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitArcane.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitBlind.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java index f755445..392f48f 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitBlind.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitBright.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java index 9725686..bd1514d 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitBright.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitCascade.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java index 45afdd2..c49de62 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitCascade.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitCurvature.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java index 3d8164b..c8aa8c5 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitCurvature.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitDark.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java index 1875806..567e1d6 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitDark.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitDiffuse.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java index 9ad265d..5f76087 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitDiffuse.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitDissolving.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java index 003b31f..41f684c 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitDissolving.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitFracture.java b/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java index 4851c34..9f377ba 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitFracture.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitFragile.java b/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java index 63474c7..ed594b5 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitFragile.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitGarishly.java b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java index 006fb84..45beff7 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitGarishly.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; @@ -18,7 +18,7 @@ import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; -import static com.sosnitzka.ztic_addon.Items.*; +import static com.sosnitzka.taiga.Items.*; public class TraitGarishly extends AbstractTrait { diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitGlimmer.java b/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java index aaa0dca..2c10852 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitGlimmer.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitHaunted.java b/src/main/java/com/sosnitzka/taiga/traits/TraitHaunted.java index 50ae188..4058bc7 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitHaunted.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitHaunted.java @@ -1,6 +1,6 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; -import com.sosnitzka.ztic_addon.util.EntityAIPermanentPanic; +import com.sosnitzka.taiga.util.EntityAIPermanentPanic; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitHeroic.java b/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java index 5cb1fb9..c54b9a9 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitHeroic.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitHollow.java b/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java index 6dbed56..960afa0 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitHollow.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitInstable.java b/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java index e2fb995..d188c86 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitInstable.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitMelting.java b/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java index bd3853b..783f815 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitMelting.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitNatureBound.java b/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java index 8cf6a11..8f406f3 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitNatureBound.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.Block; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitOrganizing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitOrganizing.java index bdfb959..f03d4c6 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitOrganizing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitOrganizing.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitPulverizing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitPulverizing.java index 3b82b09..174883a 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitPulverizing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitPulverizing.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitRandomize.java b/src/main/java/com/sosnitzka/taiga/traits/TraitRandomize.java index 230229a..4991709 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitRandomize.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitRandomize.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -18,7 +18,7 @@ import slimeknights.tconstruct.library.traits.AbstractTrait; import slimeknights.tconstruct.library.utils.ToolHelper; import slimeknights.tconstruct.world.entity.EntityBlueSlime; -import static com.sosnitzka.ztic_addon.Blocks.*; +import static com.sosnitzka.taiga.Blocks.*; import static slimeknights.tconstruct.shared.TinkerCommons.oreArdite; import static slimeknights.tconstruct.shared.TinkerCommons.oreCobalt; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitResonance.java b/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java index 33a59de..5a3450d 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitResonance.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitReviving.java b/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java index 64be2c1..92ac23b 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitReviving.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitSlaughtering.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java index a7cbd2a..99f15e0 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitSlaughtering.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitSofty.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java index 0142b34..4771e72 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitSofty.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitUncertain.java b/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java index 9a1324b..8bd8f7b 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/traits/TraitUncertain.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.traits; +package com.sosnitzka.taiga.traits; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -19,8 +19,8 @@ import slimeknights.tconstruct.library.utils.TagUtil; import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; -import static com.sosnitzka.ztic_addon.Items.glimmerstone_dust; -import static com.sosnitzka.ztic_addon.Items.tiberiumShardStable; +import static com.sosnitzka.taiga.Items.glimmerstone_dust; +import static com.sosnitzka.taiga.Items.tiberiumShardStable; public class TraitUncertain extends AbstractTrait { diff --git a/src/main/java/com/sosnitzka/ztic_addon/util/EntityAIPermanentPanic.java b/src/main/java/com/sosnitzka/taiga/util/EntityAIPermanentPanic.java index 86c04b9..4b4e96b 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/util/EntityAIPermanentPanic.java +++ b/src/main/java/com/sosnitzka/taiga/util/EntityAIPermanentPanic.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.util; +package com.sosnitzka.taiga.util; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/com/sosnitzka/ztic_addon/util/FuelHandler.java b/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java index 572692c..ee655e5 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/util/FuelHandler.java +++ b/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java @@ -1,12 +1,12 @@ -package com.sosnitzka.ztic_addon.util; +package com.sosnitzka.taiga.util; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.IFuelHandler; import org.apache.commons.lang3.RandomUtils; -import static com.sosnitzka.ztic_addon.Items.fuel_brick; -import static com.sosnitzka.ztic_addon.Items.glimmercoal; -import static com.sosnitzka.ztic_addon.Items.lignite; +import static com.sosnitzka.taiga.Items.fuel_brick; +import static com.sosnitzka.taiga.Items.glimmercoal; +import static com.sosnitzka.taiga.Items.lignite; public class FuelHandler implements IFuelHandler { diff --git a/src/main/java/com/sosnitzka/ztic_addon/util/Generator.java b/src/main/java/com/sosnitzka/taiga/util/Generator.java index 372f131..e7aed53 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/util/Generator.java +++ b/src/main/java/com/sosnitzka/taiga/util/Generator.java @@ -1,6 +1,6 @@ -package com.sosnitzka.ztic_addon.util; +package com.sosnitzka.taiga.util; -import com.sosnitzka.ztic_addon.world.ZWorldGenMinable; +import com.sosnitzka.taiga.world.ZWorldGenMinable; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/sosnitzka/ztic_addon/util/StateMatcher.java b/src/main/java/com/sosnitzka/taiga/util/StateMatcher.java index 25dfde8..a5e9c17 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/util/StateMatcher.java +++ b/src/main/java/com/sosnitzka/taiga/util/StateMatcher.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.util; +package com.sosnitzka.taiga.util; import com.google.common.base.Predicate; import net.minecraft.block.properties.IProperty; diff --git a/src/main/java/com/sosnitzka/ztic_addon/util/Utils.java b/src/main/java/com/sosnitzka/taiga/util/Utils.java index 656d5ff..184b935 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/util/Utils.java +++ b/src/main/java/com/sosnitzka/taiga/util/Utils.java @@ -1,4 +1,4 @@ -package com.sosnitzka.ztic_addon.util; +package com.sosnitzka.taiga.util; import net.minecraft.block.Block; diff --git a/src/main/java/com/sosnitzka/ztic_addon/world/ZWorldGen.java b/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java index b2d94d0..87d1b77 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/world/ZWorldGen.java +++ b/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java @@ -1,6 +1,6 @@ -package com.sosnitzka.ztic_addon.world; +package com.sosnitzka.taiga.world; -import com.sosnitzka.ztic_addon.util.Generator; +import com.sosnitzka.taiga.util.Generator; import net.minecraft.block.BlockStone; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -10,7 +10,7 @@ import net.minecraftforge.fml.common.IWorldGenerator; import java.util.Random; -import static com.sosnitzka.ztic_addon.Blocks.*; +import static com.sosnitzka.taiga.Blocks.*; public class ZWorldGen implements IWorldGenerator { private void nether(Random random, int x, int z, World world) { diff --git a/src/main/java/com/sosnitzka/ztic_addon/world/ZWorldGenMinable.java b/src/main/java/com/sosnitzka/taiga/world/ZWorldGenMinable.java index 85988ad..ef85f17 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/world/ZWorldGenMinable.java +++ b/src/main/java/com/sosnitzka/taiga/world/ZWorldGenMinable.java @@ -1,7 +1,7 @@ -package com.sosnitzka.ztic_addon.world; +package com.sosnitzka.taiga.world; import com.google.common.base.Predicate; -import com.sosnitzka.ztic_addon.util.StateMatcher; +import com.sosnitzka.taiga.util.StateMatcher; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockMatcher; import net.minecraft.init.Blocks; @@ -15,7 +15,7 @@ import java.util.Random; public class ZWorldGenMinable extends WorldGenMinable { private final IBlockState oreBlock; /** - * The number of com.sosnitzka.ztic_addon.blocks to generate. + * The number of com.sosnitzka.taiga.blocks to generate. */ private final int numberOfBlocks; private final Predicate<IBlockState> predicate; |
