Project renamed to "TAIGA: Tinkers alloying addon"

This commit is contained in:
Robert Sosnitzka
2016-07-18 16:04:36 +02:00
parent c72689b68a
commit 7515737cb4
264 changed files with 341 additions and 339 deletions

View File

@@ -28,8 +28,8 @@ repositories {
}
version = "0.9"
group = "com.sosnitzka.ztic_addon" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "ztic_addon"
group = "com.sosnitzka.taiga" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "taiga"
minecraft {
version = "1.10.2-12.18.1.2011"

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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();
}

View File

@@ -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();

View File

@@ -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;

View File

@@ -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();

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package com.sosnitzka.ztic_addon.generic;
package com.sosnitzka.taiga.generic;
import net.minecraft.item.Item;

View File

@@ -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;

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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

View File

@@ -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;

View File

@@ -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 {

View File

@@ -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() {

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package com.sosnitzka.ztic_addon.util;
package com.sosnitzka.taiga.util;
import net.minecraft.block.Block;

View File

@@ -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) {

View File

@@ -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;

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:adamantite_block"
"model": "taiga:adamantite_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:adamantite_ore"
"model": "taiga:adamantite_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:aegisalt_block"
"model": "taiga:aegisalt_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:arcanite_block"
"model": "taiga:arcanite_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:arcanite_ore"
"model": "taiga:arcanite_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:astrium_block"
"model": "taiga:astrium_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:basalt"
"model": "taiga:basalt"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:bismuth_block"
"model": "taiga:bismuth_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:bismuth_ore"
"model": "taiga:bismuth_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:bysmuid_block"
"model": "taiga:bysmuid_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:cryptogen_block"
"model": "taiga:cryptogen_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:dyonite_block"
"model": "taiga:dyonite_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:eternite_block"
"model": "taiga:eternite_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:eternite_ore"
"model": "taiga:eternite_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:fractoryte_block"
"model": "taiga:fractoryte_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:ignitite_block"
"model": "taiga:ignitite_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:ignitite_ore"
"model": "taiga:ignitite_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:imperomite_block"
"model": "taiga:imperomite_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:karmesine_block"
"model": "taiga:karmesine_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:karmesine_ore"
"model": "taiga:karmesine_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:lignite_ore"
"model": "taiga:lignite_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:lumixyl_block"
"model": "taiga:lumixyl_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:meteorite_block"
"model": "taiga:meteorite_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:meteorite_ore"
"model": "taiga:meteorite_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:mindorite_block"
"model": "taiga:mindorite_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:mindorite_ore"
"model": "taiga:mindorite_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:mythril_block"
"model": "taiga:mythril_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:mythril_ore"
"model": "taiga:mythril_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:nitronite_block"
"model": "taiga:nitronite_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:noctunyx_block"
"model": "taiga:noctunyx_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:nucleum_block"
"model": "taiga:nucleum_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:palladium_block"
"model": "taiga:palladium_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:palladium_ore"
"model": "taiga:palladium_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:prometheum_block"
"model": "taiga:prometheum_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:prometheum_ore"
"model": "taiga:prometheum_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:proxideum_block"
"model": "taiga:proxideum_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:rotten_ground"
"model": "taiga:rotten_ground"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:rubium_block"
"model": "taiga:rubium_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:rubium_ore"
"model": "taiga:rubium_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:seismodium_block"
"model": "taiga:seismodium_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:slaggold_ore"
"model": "taiga:slaggold_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:slagiron_ore"
"model": "taiga:slagiron_ore"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:solarium_block"
"model": "taiga:solarium_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:terramite_block"
"model": "taiga:terramite_block"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "ztic_addon:tiberium_block"
"model": "taiga:tiberium_block"
}
}
}

Some files were not shown because too many files have changed in this diff Show More