Commit cc4663c4 authored by Dennis Bonke's avatar Dennis Bonke Committed by Dennis

Added german and ussr flag.

Signed-off-by: default avatarDennis <admin@dennisbonke.com>
parent a541949f
......@@ -50,7 +50,7 @@ idea.module.inheritOutputDirs = true
project.buildnumber = "5"
version = "1.7.10-0.2.2-B1" + "-" + project.buildnumber
version = "1.7.10-0.2.2-B2" + "-" + project.buildnumber
group= "com.advancedmods" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "AdvancedTools"
......@@ -66,7 +66,7 @@ configurations {
deployerJars
}
task buildInfo {
/*task buildInfo {
def cmd = "git rev-parse --short HEAD"
def proc = cmd.execute()
proc.waitFor()
......@@ -81,7 +81,7 @@ task buildInfo {
} else {
ext.buildNum = "DEV.${project.buildInfo.revision}"
}
}
}*/
/*if (System.getenv().ARTIFACT_VERSION == null) {
artifact_version = "${config.mod_version}.${project.buildInfo.buildNum}"
......
package com.advancedmods.advancedtools.common.block;
import com.advancedmods.advancedtools.AdvancedTools;
import com.advancedmods.advancedtools.common.generic.block.ATBlock;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
public class ATGermanFlagBlock extends ATBlock {
private boolean playingSound = false;
public ATGermanFlagBlock() {
super(Material.rock);
this.setCreativeTab(AdvancedTools.tabMaterials);
this.setBlockName("germanflagblock");
this.setBlockTextureName("advancedtools:germanflagblock");
}
@Override
public boolean onBlockActivated(World world, int p_149727_2_, int p_149727_3_, int p_149727_4_, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) {
AdvancedTools.log.warn("Block activated!");
if(world.isRemote) {
if(!playingSound) {
world.playRecord("advancedtools:blocks.viktoria", (int) player.posX, (int) player.posY, (int) player.posZ);
playingSound = true;
return super.onBlockActivated(world, p_149727_2_, p_149727_3_, p_149727_4_, player, p_149727_6_, p_149727_7_, p_149727_8_, p_149727_9_);
} else {
Minecraft.getMinecraft().getSoundHandler().stopSounds();
playingSound = false;
return super.onBlockActivated(world, p_149727_2_, p_149727_3_, p_149727_4_, player, p_149727_6_, p_149727_7_, p_149727_8_, p_149727_9_);
}
} else {
return super.onBlockActivated(world, p_149727_2_, p_149727_3_, p_149727_4_, player, p_149727_6_, p_149727_7_, p_149727_8_, p_149727_9_);
}
}
}
package com.advancedmods.advancedtools.common.generic.block;
package com.advancedmods.advancedtools.common.block;
import com.advancedmods.advancedtools.AdvancedTools;
import com.advancedmods.amcore.AMCore;
import com.advancedmods.advancedtools.common.generic.block.ATBlock;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
public class ATFlagBlock extends ATBlock {
public class ATUSSRFlagBlock extends ATBlock {
public ATFlagBlock() {
private boolean playingSound = false;
public ATUSSRFlagBlock() {
super(Material.rock);
this.setCreativeTab(AdvancedTools.tabMaterials);
this.setBlockName("flagtestblock");
this.setBlockTextureName("advancedtools:flagTestBlock");
this.setBlockName("ussrflagblock");
this.setBlockTextureName("advancedtools:ussrflagblock");
}
@Override
public boolean onBlockActivated(World world, int p_149727_2_, int p_149727_3_, int p_149727_4_, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) {
AMCore.log.warn("Block activated!");
world.playRecord("advancedtools:blocks.ussr", (int) player.posX, (int) player.posY, (int) player.posZ);
return super.onBlockActivated(world, p_149727_2_, p_149727_3_, p_149727_4_, player, p_149727_6_, p_149727_7_, p_149727_8_, p_149727_9_);
AdvancedTools.log.warn("Block activated!");
if(world.isRemote) {
if(!playingSound) {
world.playRecord("advancedtools:blocks.ussr", (int) player.posX, (int) player.posY, (int) player.posZ);
playingSound = true;
return super.onBlockActivated(world, p_149727_2_, p_149727_3_, p_149727_4_, player, p_149727_6_, p_149727_7_, p_149727_8_, p_149727_9_);
} else {
Minecraft.getMinecraft().getSoundHandler().stopSounds();
playingSound = false;
return super.onBlockActivated(world, p_149727_2_, p_149727_3_, p_149727_4_, player, p_149727_6_, p_149727_7_, p_149727_8_, p_149727_9_);
}
} else {
return super.onBlockActivated(world, p_149727_2_, p_149727_3_, p_149727_4_, player, p_149727_6_, p_149727_7_, p_149727_8_, p_149727_9_);
}
}
}
......@@ -9,7 +9,7 @@ public class ATProps {
// Versioning
public static final String MC_VERSION = "1.7.10";
public static final String VERSION_COMPLETE = "1.7.10R0.2.2B1";
public static final String VERSION_COMPLETE = "1.7.10R0.2.2B2";
public static final String FORGE_BASE = "10.13.4.";
public static final String FORGE_BUILD = "1614";
public static final String FORGE_VERSION = "[" + FORGE_BASE + FORGE_BUILD + "]";
......
package com.advancedmods.advancedtools.core;
import com.advancedmods.advancedtools.common.block.ATGermanFlagBlock;
import com.advancedmods.advancedtools.common.block.ATUSSRFlagBlock;
import com.advancedmods.advancedtools.common.block.BlockNetherStar;
import com.advancedmods.advancedtools.common.generic.block.ATFlagBlock;
import com.advancedmods.advancedtools.common.items.TestSword;
import com.advancedmods.advancedtools.common.items.armor.EmeraldArmor;
import com.advancedmods.advancedtools.common.items.baubles.RingOfFlight;
import com.advancedmods.advancedtools.common.items.tools.ingot.BoneIngot;
import com.advancedmods.advancedtools.common.items.tools.ingot.CopperIngot;
import com.advancedmods.advancedtools.common.items.tools.ingot.EnderionIngot;
import com.advancedmods.advancedtools.common.items.tools.ingot.FlintIngot;
import com.advancedmods.advancedtools.common.items.tools.ingot.LapisIngot;
import com.advancedmods.advancedtools.common.items.tools.ingot.NetherionIngot;
import com.advancedmods.advancedtools.common.items.tools.ingot.RedstoneIngot;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
......@@ -22,7 +17,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
/**
* Created by Dennisbonke on 15-4-2015.
......@@ -191,7 +185,8 @@ public class ATRegistry {
// Blocks
//public static Block BlockCopper = new BlockCopper();
public static Block flagTestBlock = new ATFlagBlock();
public static Block ussrFlagBlock = new ATUSSRFlagBlock();
public static Block germanFlagBlock = new ATGermanFlagBlock();
// Baubles.
public static Item ringOfFlight = new RingOfFlight();
......@@ -207,7 +202,9 @@ public class ATRegistry {
GameRegistry.registerBlock(blockNetherStar, "netherstarblock");
}
if(ATConfigHandler.enableTestingStuff) {
GameRegistry.registerBlock(flagTestBlock, "flagtestblock");
GameRegistry.registerBlock(ussrFlagBlock, "ussrflagblock");
GameRegistry.registerBlock(germanFlagBlock, "germanflagblock");
GameRegistry.registerItem(opSword, "opsword");
}
// Items
......@@ -411,6 +408,8 @@ public class ATRegistry {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(emeraldChestplate), "e e", "eee", "eee", 'e', "gemEmerald"));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(emeraldLeggings), "eee", "e e", "e e", 'e', "gemEmerald"));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(emeraldBoots), " ", "e e", "e e", 'e', "gemEmerald"));
//
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ussrFlagBlock), "srr", "gGr", "rrr", 's', Items.nether_star, 'r', "dyeRed", 'g', Items.golden_axe, 'G', Items.golden_hoe));
// Redstone
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.redstoneHelmet), "rrr", "r r", " ", 'r', "ingotRedstone"));
......
......@@ -15,7 +15,8 @@ item.advancedtools:EmeraldBoots.name=Emerald Boots
// Blocks
tile.advancedtools:netherstarblock.name=Nether Star Block
tile.advancedtools:testflagblock.name=Test Flag Blok
tile.advancedtools:ussrflagblock.name=USSR Flag
tile.advancedtools:germanflagblock.name=Nazi Flag
// Ingots
item.advancedtools:boneingot.name=Bone Ingot
......
......@@ -15,7 +15,8 @@ item.advancedtools:EmeraldBoots.name=Smaragd Schoenen
// Blocks
tile.advancedtools:netherstarblock.name=Nether Ster Blok
tile.advancedtools:testflagblock.name=Test Vlag Blok
tile.advancedtools:ussrflagblock.name=USSR Vlag
tile.advancedtools:germanflagblock.name=Nazi Vlag
// Ingots
item.advancedtools:boneingot.name=Been Staaf
......
{
"blocks.ussr": {"category": "ambient","sounds": [{"name": "ussr","stream": false},"blocks/ussr/ussr"]}
"blocks.ussr": {"category": "ambient","sounds": [{"name": "ussr","stream": true},"blocks/ussr/ussr"]},
"blocks.viktoria": {"category": "ambient","sounds": [{"name": "viktoria","stream": true},"blocks/german/viktoria"]}
}
\ No newline at end of file
......@@ -2,7 +2,7 @@
{
"modid" : "AdvancedTools",
"name" : "Advanced Tools",
"version": "1.7.10R0.2.2B1",
"version": "1.7.10R0.2.2B2",
"mcversion": "1.7.10",
"url" : "",
"credits" : "Vazkii, SpitefulFox",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment