summaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorGiovanni Harting <539@idlegandalf.com>2016-05-12 17:55:53 +0200
committerGiovanni Harting <539@idlegandalf.com>2016-05-12 17:55:53 +0200
commit217cbcd30d8a284e255a5146f0bf35d0c57b725c (patch)
tree5e78413ce2d2fbbb0eda31e45648c320a2b7e6f4 /src/main/java
parent5a0ebb11b2d74b0f97f66b40fdfd82ee033e85ce (diff)
fixed wrong package
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/blocks/BlockLigniteOre.java (renamed from src/main/java/blocks/BlockLigniteOre.java)6
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java (renamed from src/main/java/blocks/BlockTiberiumOre.java)6
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/blocks/category/BasicBlockGround.java (renamed from src/main/java/blocks/category/BasicBlockGround.java)2
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/blocks/category/BasicBlockOre.java (renamed from src/main/java/blocks/category/BasicBlockOre.java)2
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/blocks/category/BasicBlockOreGlow.java (renamed from src/main/java/blocks/category/BasicBlockOreGlow.java)2
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/fluids/BasicFluid.java (renamed from src/main/java/fluids/BasicFluid.java)4
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/items/BasicItem.java (renamed from src/main/java/items/BasicItem.java)2
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/items/ItemIronNugget.java (renamed from src/main/java/items/ItemIronNugget.java)2
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/items/ItemLignite.java (renamed from src/main/java/items/ItemLignite.java)2
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/items/ItemSlaggoldIngot.java (renamed from src/main/java/items/ItemSlaggoldIngot.java)2
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/items/ItemSlagironIngot.java (renamed from src/main/java/items/ItemSlagironIngot.java)2
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/main/ZTiC.java (renamed from src/main/java/main/ZTiC.java)28
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/main/util/FuelHandler.java (renamed from src/main/java/main/util/FuelHandler.java)4
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/main/util/Generator.java (renamed from src/main/java/main/util/Generator.java)2
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/main/util/StateMatcher.java (renamed from src/main/java/main/util/StateMatcher.java)2
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/main/util/ZWorldGenMinable.java (renamed from src/main/java/main/util/ZWorldGenMinable.java)4
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/main/util/recipes/Crafting.java (renamed from src/main/java/main/util/recipes/Crafting.java)4
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/main/util/recipes/Smelting.java (renamed from src/main/java/main/util/recipes/Smelting.java)4
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/main/world/ZWorldGen.java (renamed from src/main/java/main/world/ZWorldGen.java)6
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/proxy/ClientProxy.java (renamed from src/main/java/proxy/ClientProxy.java)6
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/proxy/ServerProxy.java (renamed from src/main/java/proxy/ServerProxy.java)2
21 files changed, 47 insertions, 47 deletions
diff --git a/src/main/java/blocks/BlockLigniteOre.java b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockLigniteOre.java
index 22234c9..7f4885c 100644
--- a/src/main/java/blocks/BlockLigniteOre.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockLigniteOre.java
@@ -1,7 +1,7 @@
-package blocks;
+package com.sosnitzka.ztic_addon.blocks;
-import blocks.category.BasicBlockOre;
-import main.ZTiC;
+import com.sosnitzka.ztic_addon.blocks.category.BasicBlockOre;
+import com.sosnitzka.ztic_addon.main.ZTiC;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.Item;
diff --git a/src/main/java/blocks/BlockTiberiumOre.java b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java
index 64c5bb5..aa570e9 100644
--- a/src/main/java/blocks/BlockTiberiumOre.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java
@@ -1,7 +1,7 @@
-package blocks;
+package com.sosnitzka.ztic_addon.blocks;
-import blocks.category.BasicBlockOreGlow;
-import main.ZTiC;
+import com.sosnitzka.ztic_addon.blocks.category.BasicBlockOreGlow;
+import com.sosnitzka.ztic_addon.main.ZTiC;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.Item;
diff --git a/src/main/java/blocks/category/BasicBlockGround.java b/src/main/java/com/sosnitzka/ztic_addon/blocks/category/BasicBlockGround.java
index 5ce7fcc..17a5163 100644
--- a/src/main/java/blocks/category/BasicBlockGround.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/blocks/category/BasicBlockGround.java
@@ -1,4 +1,4 @@
-package blocks.category;
+package com.sosnitzka.ztic_addon.blocks.category;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
diff --git a/src/main/java/blocks/category/BasicBlockOre.java b/src/main/java/com/sosnitzka/ztic_addon/blocks/category/BasicBlockOre.java
index 6e51033..52078ef 100644
--- a/src/main/java/blocks/category/BasicBlockOre.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/blocks/category/BasicBlockOre.java
@@ -1,4 +1,4 @@
-package blocks.category;
+package com.sosnitzka.ztic_addon.blocks.category;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
diff --git a/src/main/java/blocks/category/BasicBlockOreGlow.java b/src/main/java/com/sosnitzka/ztic_addon/blocks/category/BasicBlockOreGlow.java
index 35a63c0..2e077dd 100644
--- a/src/main/java/blocks/category/BasicBlockOreGlow.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/blocks/category/BasicBlockOreGlow.java
@@ -1,4 +1,4 @@
-package blocks.category;
+package com.sosnitzka.ztic_addon.blocks.category;
import net.minecraft.block.material.Material;
diff --git a/src/main/java/fluids/BasicFluid.java b/src/main/java/com/sosnitzka/ztic_addon/fluids/BasicFluid.java
index af6a389..3ece5c8 100644
--- a/src/main/java/fluids/BasicFluid.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/fluids/BasicFluid.java
@@ -1,4 +1,4 @@
-package fluids;
+package com.sosnitzka.ztic_addon.fluids;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
@@ -8,7 +8,7 @@ public class BasicFluid extends Fluid {
private int color;
public BasicFluid(String fluidName, int color) {
- super(fluidName, new ResourceLocation("tconstruct:blocks/fluids/molten_metal"), new ResourceLocation("tconstruct:blocks/fluids/molten_metal_flow"));
+ super(fluidName, new ResourceLocation("tconstruct:com.sosnitzka.ztic_addon.blocks/com.sosnitzka.ztic_addon.fluids/molten_metal"), new ResourceLocation("tconstruct:com.sosnitzka.ztic_addon.blocks/com.sosnitzka.ztic_addon.fluids/molten_metal_flow"));
this.color = color;
}
diff --git a/src/main/java/items/BasicItem.java b/src/main/java/com/sosnitzka/ztic_addon/items/BasicItem.java
index 9ae4ca2..c7a828f 100644
--- a/src/main/java/items/BasicItem.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/items/BasicItem.java
@@ -1,4 +1,4 @@
-package items;
+package com.sosnitzka.ztic_addon.items;
import net.minecraft.item.Item;
diff --git a/src/main/java/items/ItemIronNugget.java b/src/main/java/com/sosnitzka/ztic_addon/items/ItemIronNugget.java
index 9bafe38..2a2f34e 100644
--- a/src/main/java/items/ItemIronNugget.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/items/ItemIronNugget.java
@@ -1,4 +1,4 @@
-package items;
+package com.sosnitzka.ztic_addon.items;
public class ItemIronNugget extends BasicItem {
diff --git a/src/main/java/items/ItemLignite.java b/src/main/java/com/sosnitzka/ztic_addon/items/ItemLignite.java
index 342dea0..5642b9a 100644
--- a/src/main/java/items/ItemLignite.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/items/ItemLignite.java
@@ -1,4 +1,4 @@
-package items;
+package com.sosnitzka.ztic_addon.items;
public class ItemLignite extends BasicItem {
diff --git a/src/main/java/items/ItemSlaggoldIngot.java b/src/main/java/com/sosnitzka/ztic_addon/items/ItemSlaggoldIngot.java
index 1ccf7aa..bdc0be0 100644
--- a/src/main/java/items/ItemSlaggoldIngot.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/items/ItemSlaggoldIngot.java
@@ -1,4 +1,4 @@
-package items;
+package com.sosnitzka.ztic_addon.items;
public class ItemSlaggoldIngot extends BasicItem {
diff --git a/src/main/java/items/ItemSlagironIngot.java b/src/main/java/com/sosnitzka/ztic_addon/items/ItemSlagironIngot.java
index d0086f3..48a9364 100644
--- a/src/main/java/items/ItemSlagironIngot.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/items/ItemSlagironIngot.java
@@ -1,4 +1,4 @@
-package items;
+package com.sosnitzka.ztic_addon.items;
public class ItemSlagironIngot extends BasicItem {
diff --git a/src/main/java/main/ZTiC.java b/src/main/java/com/sosnitzka/ztic_addon/main/ZTiC.java
index 2d5109e..7d19609 100644
--- a/src/main/java/main/ZTiC.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/main/ZTiC.java
@@ -1,17 +1,18 @@
-package main;
+package com.sosnitzka.ztic_addon.main;
-import blocks.BlockLigniteOre;
-import blocks.BlockTiberiumOre;
-import blocks.category.BasicBlockGround;
-import blocks.category.BasicBlockOre;
-import blocks.category.BasicBlockOreGlow;
import com.google.common.collect.Lists;
-import fluids.BasicFluid;
-import items.*;
-import main.util.FuelHandler;
-import main.util.recipes.Crafting;
-import main.util.recipes.Smelting;
-import main.world.ZWorldGen;
+import com.sosnitzka.ztic_addon.blocks.BlockLigniteOre;
+import com.sosnitzka.ztic_addon.blocks.BlockTiberiumOre;
+import com.sosnitzka.ztic_addon.blocks.category.BasicBlockGround;
+import com.sosnitzka.ztic_addon.blocks.category.BasicBlockOre;
+import com.sosnitzka.ztic_addon.blocks.category.BasicBlockOreGlow;
+import com.sosnitzka.ztic_addon.fluids.BasicFluid;
+import com.sosnitzka.ztic_addon.items.*;
+import com.sosnitzka.ztic_addon.main.util.FuelHandler;
+import com.sosnitzka.ztic_addon.main.util.recipes.Crafting;
+import com.sosnitzka.ztic_addon.main.util.recipes.Smelting;
+import com.sosnitzka.ztic_addon.main.world.ZWorldGen;
+import com.sosnitzka.ztic_addon.proxy.ServerProxy;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
@@ -30,7 +31,6 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
-import proxy.ServerProxy;
import slimeknights.tconstruct.library.MaterialIntegration;
import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
import slimeknights.tconstruct.library.materials.HandleMaterialStats;
@@ -147,7 +147,7 @@ public class ZTiC {
public static slimeknights.tconstruct.library.materials.Material radiantPlinium = new slimeknights.tconstruct.library.materials.Material("radiantPlinium", TextFormatting.AQUA);
public static slimeknights.tconstruct.library.materials.Material dysprosanium = new slimeknights.tconstruct.library.materials.Material("dysprosanium", TextFormatting.AQUA);
public static slimeknights.tconstruct.library.materials.Material refractiveBysmuid = new slimeknights.tconstruct.library.materials.Material("refractiveBysmuidFluid", TextFormatting.AQUA);
- @SidedProxy(clientSide = "proxy.ClientProxy", serverSide = "proxy.ServerProxy")
+ @SidedProxy(clientSide = "com.sosnitzka.ztic_addon.proxy.ClientProxy", serverSide = "com.sosnitzka.ztic_addon.proxy.ServerProxy")
private static ServerProxy proxy;
private List<MaterialIntegration> integrateList = Lists.newArrayList();
diff --git a/src/main/java/main/util/FuelHandler.java b/src/main/java/com/sosnitzka/ztic_addon/main/util/FuelHandler.java
index d66c488..9ab6edd 100644
--- a/src/main/java/main/util/FuelHandler.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/main/util/FuelHandler.java
@@ -1,6 +1,6 @@
-package main.util;
+package com.sosnitzka.ztic_addon.main.util;
-import main.ZTiC;
+import com.sosnitzka.ztic_addon.main.ZTiC;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.IFuelHandler;
import org.apache.commons.lang3.RandomUtils;
diff --git a/src/main/java/main/util/Generator.java b/src/main/java/com/sosnitzka/ztic_addon/main/util/Generator.java
index 410b124..97937c7 100644
--- a/src/main/java/main/util/Generator.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/main/util/Generator.java
@@ -1,4 +1,4 @@
-package main.util;
+package com.sosnitzka.ztic_addon.main.util;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
diff --git a/src/main/java/main/util/StateMatcher.java b/src/main/java/com/sosnitzka/ztic_addon/main/util/StateMatcher.java
index 933cce0..acaaedf 100644
--- a/src/main/java/main/util/StateMatcher.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/main/util/StateMatcher.java
@@ -1,4 +1,4 @@
-package main.util;
+package com.sosnitzka.ztic_addon.main.util;
import com.google.common.base.Predicate;
import net.minecraft.block.properties.IProperty;
diff --git a/src/main/java/main/util/ZWorldGenMinable.java b/src/main/java/com/sosnitzka/ztic_addon/main/util/ZWorldGenMinable.java
index 839a02e..cf0ed41 100644
--- a/src/main/java/main/util/ZWorldGenMinable.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/main/util/ZWorldGenMinable.java
@@ -1,4 +1,4 @@
-package main.util;
+package com.sosnitzka.ztic_addon.main.util;
import com.google.common.base.Predicate;
import net.minecraft.block.state.IBlockState;
@@ -14,7 +14,7 @@ import java.util.Random;
public class ZWorldGenMinable extends WorldGenMinable {
private final IBlockState oreBlock;
/**
- * The number of blocks to generate.
+ * The number of com.sosnitzka.ztic_addon.blocks to generate.
*/
private final int numberOfBlocks;
private final Predicate<IBlockState> predicate;
diff --git a/src/main/java/main/util/recipes/Crafting.java b/src/main/java/com/sosnitzka/ztic_addon/main/util/recipes/Crafting.java
index cf5907e..d057a67 100644
--- a/src/main/java/main/util/recipes/Crafting.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/main/util/recipes/Crafting.java
@@ -1,7 +1,7 @@
-package main.util.recipes;
+package com.sosnitzka.ztic_addon.main.util.recipes;
-import main.ZTiC;
+import com.sosnitzka.ztic_addon.main.ZTiC;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
diff --git a/src/main/java/main/util/recipes/Smelting.java b/src/main/java/com/sosnitzka/ztic_addon/main/util/recipes/Smelting.java
index 41735b4..a8f15e7 100644
--- a/src/main/java/main/util/recipes/Smelting.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/main/util/recipes/Smelting.java
@@ -1,7 +1,7 @@
-package main.util.recipes;
+package com.sosnitzka.ztic_addon.main.util.recipes;
-import main.ZTiC;
+import com.sosnitzka.ztic_addon.main.ZTiC;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
diff --git a/src/main/java/main/world/ZWorldGen.java b/src/main/java/com/sosnitzka/ztic_addon/main/world/ZWorldGen.java
index 2c35e76..010e4ed 100644
--- a/src/main/java/main/world/ZWorldGen.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/main/world/ZWorldGen.java
@@ -1,7 +1,7 @@
-package main.world;
+package com.sosnitzka.ztic_addon.main.world;
-import main.ZTiC;
-import main.util.Generator;
+import com.sosnitzka.ztic_addon.main.ZTiC;
+import com.sosnitzka.ztic_addon.main.util.Generator;
import net.minecraft.block.BlockStone;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
diff --git a/src/main/java/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/ztic_addon/proxy/ClientProxy.java
index 7d4bb12..967c572 100644
--- a/src/main/java/proxy/ClientProxy.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/proxy/ClientProxy.java
@@ -1,12 +1,12 @@
-package proxy;
+package com.sosnitzka.ztic_addon.proxy;
-import main.ZTiC;
+import com.sosnitzka.ztic_addon.main.ZTiC;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
-import static main.ZTiC.*;
+import static com.sosnitzka.ztic_addon.main.ZTiC.*;
public class ClientProxy extends ServerProxy {
diff --git a/src/main/java/proxy/ServerProxy.java b/src/main/java/com/sosnitzka/ztic_addon/proxy/ServerProxy.java
index 08001dc..438f96d 100644
--- a/src/main/java/proxy/ServerProxy.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/proxy/ServerProxy.java
@@ -1,4 +1,4 @@
-package proxy;
+package com.sosnitzka.ztic_addon.proxy;
public class ServerProxy {