Commit c070c7b0 authored by Dennis Bonke's avatar Dennis Bonke

Added baubles ring of flight, fixed emerald armor?

parent 47f0cc3f
......@@ -31,7 +31,7 @@ stages:
setup-workspace:
stage: setup
script: ./gradlew -i setupDecompWorkspace -Pmaven_pass=$MAVEN_PASS
script: ./gradlew -i setupDevWorkspace -Pmaven_pass=$MAVEN_PASS
cache:
key: "$CI_COMMIT_REF_NAME"
policy: push
......@@ -45,9 +45,9 @@ build-jar:
cache:
key: "$CI_COMMIT_REF_NAME"
policy: push
paths:
- build
- .gradle
#paths:
# - build
# - .gradle
deploy-to-maven:
stage: deploy
......@@ -55,9 +55,9 @@ deploy-to-maven:
cache:
key: "$CI_COMMIT_REF_NAME"
policy: push
paths:
- build
- .gradle
#paths:
# - build
# - .gradle
#test:
# stage: test
......
1.7.10R0.2.0A1 Alpha 1! Initial Alpha release!
\ No newline at end of file
1.7.10R0.2.2B1 Beta 1! Initial Beta release, now with baubles ring of flight!
\ No newline at end of file
......@@ -46,7 +46,7 @@ else
println "!! No build number set !!"
}
project.buildnumber = "2"
project.buildnumber = "3"
version = "1.7.10-0.2.2-B1" + "-" + project.buildnumber
group= "com.advancedmods" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
......@@ -112,11 +112,15 @@ dependencies {
// or you may define them like so..
//compile "some.group:artifact:version:classifier"
//compile "some.group:artifact:version"
compile files(
'deps/Baubles-1.7.10-1.0.1.10-deobf.jar'
)
// real examples
//compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
//compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
compile 'com.advancedmods:AMCore:1.7.10-0.2.2-B1-2:dev'
compile 'com.advancedmods:AMCore:1.7.10-0.2.2-B1-4:dev'
// for more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
......@@ -145,10 +149,6 @@ processResources
}
/*artifacts {
archives javadocJar
}
artifacts {
archives deobfJar
}
......@@ -164,6 +164,10 @@ task deobfJar(type: Jar) {
}
}
artifacts {
archives javadocJar
}
//Create a task to create a javadoc for the developers
task javadocJar(type: Jar, dependsOn: javadoc) {
//Again, maven standards to use classifier of javadoc, any smart IDE will use this if asked.
......
......@@ -18,10 +18,11 @@ import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.util.MinecraftError;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import javax.smartcardio.ATR;
/**
* Created by Dennisbonke on 17-3-2015.
*/
......@@ -31,14 +32,13 @@ public class AdvancedTools extends BaseMod {
@Instance(ATProps.modid)
public static AdvancedTools instance;
public static Logger log = LogManager.getLogger(ATProps.modid);
public static final String issueURL = "https://github.com/AdvancedMods/AdvancedTools/issues";
public static final String updateURL = "https://raw.github.com/AdvancedMods/AdvancedTools/master/VERSION";
public static final String downloadURL = "http://ci.zsinfo.nl/view/AdvancedMods/job/AdvancedTools/lastSuccessfulBuild";
public static final String issueURL = "http://git.zsinfo.nl/AdvancedMods/AdvancedTools/issues";
public static final String updateURL = "http://git.zsinfo.com/AdvancedMods/AdvancedTools/tree/master/VERSION";
public static final String downloadURL = "http://git.zsinfo.nl/AdvancedMods/AdvancedTools/pipelines";
// Creative Tabs
public static final CreativeTabs tabCombat = new CreativeTabATCombat("Combat");
public static final CreativeTabs tabMaterials = new CreativeTabATMaterials("Materials");
public static final CreativeTabs tabTools = new CreativeTabATTools("Tools");
private static final MinecraftError error = new MinecraftError();
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
......@@ -63,6 +63,9 @@ public class AdvancedTools extends BaseMod {
log.info("Registering Items and Blocks...");
ATRegistry.registerItemsAndBlocks();
log.info("Items and Blocks registered.");
log.info("Registering baubles...");
ATRegistry.initBaublesItems();
log.info("Baubles registered");
} catch (Exception e) {
log.fatal("=============================FATAL ERROR!=============================");
log.fatal("Failed to register Items and Blocks, printing stacktrace...");
......@@ -70,7 +73,7 @@ public class AdvancedTools extends BaseMod {
log.fatal("Please report this as a bug report with the stacktrace, the minecraft log and a mod list + version to: " + issueURL);
log.fatal("=============================FATAL ERROR!=============================");
e.printStackTrace();
FMLCommonHandler.instance().raiseException(error, "[Advanced Tools] Failed to register Items and Blocks, halting game", true);
FMLCommonHandler.instance().raiseException(e, "[Advanced Tools] Failed to register Items and Blocks, halting game", true);
}
// Oredictionary Registry
try {
......@@ -96,6 +99,7 @@ public class AdvancedTools extends BaseMod {
try {
log.info("Registering Recipes...");
ATRegistry.registerRecipes();
ATRegistry.initBaublesRecipes();
log.info("Recipes registered.");
} catch (Exception e) {
log.error("=============================ERROR!=============================");
......
......@@ -16,6 +16,7 @@ public class ATItem extends Item {
{
super();
}
@Override
public String getUnlocalizedName()
{
......
......@@ -17,6 +17,8 @@ public class EmeraldArmor extends ATItemArmor {
this.setCreativeTab(AdvancedTools.tabCombat);
this.setUnlocalizedName(name);
this.setTextureName(ATProps.modid.toLowerCase() + ":" + texture);
this.setMaxDamage(material.getDurability(j));
this.setMaxStackSize(1);
}
@Override
......
package com.advancedmods.advancedtools.common.items.baubles;
import baubles.api.BaubleType;
import baubles.api.IBauble;
import com.advancedmods.advancedtools.AdvancedTools;
import com.advancedmods.advancedtools.common.generic.ATItem;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
/**
* Created by Dennis on 5-10-2017.
*/
public class RingOfFlight extends ATItem implements IBauble {
public RingOfFlight() {
this.setUnlocalizedName("RingOfFlight");
this.setCreativeTab(AdvancedTools.tabTools);
}
@Override
public BaubleType getBaubleType(ItemStack itemStack) {
return BaubleType.RING;
}
@Override
public void onWornTick(ItemStack itemStack, EntityLivingBase entityLivingBase) {
// NO-OP
}
@Override
public void onEquipped(ItemStack itemStack, EntityLivingBase entityLivingBase) {
Minecraft mc = Minecraft.getMinecraft();
mc.thePlayer.capabilities.allowFlying = true;
}
@Override
public void onUnequipped(ItemStack itemStack, EntityLivingBase entityLivingBase) {
Minecraft mc = Minecraft.getMinecraft();
mc.thePlayer.capabilities.isFlying = false;
mc.thePlayer.capabilities.allowFlying = false;
}
@Override
public boolean canEquip(ItemStack itemStack, EntityLivingBase entityLivingBase) {
return true;
}
@Override
public boolean canUnequip(ItemStack itemStack, EntityLivingBase entityLivingBase) {
return true;
}
}
......@@ -9,17 +9,18 @@ public class ATProps {
// Versioning
public static final String MC_VERSION = "1.7.10";
public static final String VERSION_COMPLETE = "1.7.10R0.2.1B1";
public static final String VERSION_COMPLETE = "1.7.10R0.2.2B1";
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 + "]";
public static final String AMCORE_VERSION = "[" + AMCoreProps.version + "]";
public static final String BAUBLES_VERSION = "1.0.1.10";
// General Mod stuff
public static final String name = "Advanced Tools";
public static final String modid = "AdvancedTools";
public static final String version = VERSION_COMPLETE;
public static final String dependencies = "required-after:Forge@" + FORGE_VERSION + ";" + "required-after:AMCore@" + AMCORE_VERSION;
public static final String dependencies = "required-after:Forge@" + FORGE_VERSION + ";" + "required-after:AMCore@" + AMCORE_VERSION + ";required-after:Baubles@" + BAUBLES_VERSION;
//public static final String commonproxy = "com.advancedmods.advancedtools.common.CommonProxy";
//public static final String clientproxy = "com.advancedmods.advancedtools.client.ClientProxy";
......
......@@ -2,6 +2,7 @@ package com.advancedmods.advancedtools.core;
import com.advancedmods.advancedtools.common.block.BlockNetherStar;
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;
......@@ -187,6 +188,9 @@ public class ATRegistry {
// Blocks
//public static Block BlockCopper = new BlockCopper();
// Baubles.
public static Item ringOfFlight = new RingOfFlight();
public static void registerItemsAndBlocks() {
// Blocks
......@@ -448,4 +452,12 @@ public class ATRegistry {
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.enderionIngot, 3), "eee", "eie", "eee", 'e', "materialEnderPearl", 'i', "ingotIron"));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.lapisIngot, 3), "lll", "lil", "lll", 'l', "gemLapis", 'i', "ingotIron"));
}
public static void initBaublesItems() {
GameRegistry.registerItem(ringOfFlight, "Ring of Flight");
}
public static void initBaublesRecipes() {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ringOfFlight), "fef", "ene", "fef", 'f', Items.feather, 'e', "gemEmerald", 'n', blockNetherStar));
}
}
\ No newline at end of file
......@@ -3,6 +3,9 @@ itemGroup.Combat=Advanced Tools:Combat
itemGroup.Materials=Advanced Tools:Materials
itemGroup.Tools=Advanced Tools:Tools
// Baubles
item.advancedtools:RingOfFlight.name=Ring of Flight
// Armor
// Emerald
item.advancedtools:EmeraldHelmet.name=Emerald Helmet
......
......@@ -2,7 +2,7 @@
{
"modid" : "AdvancedTools",
"name" : "Advanced Tools",
"version": "1.7.10R0.2.1B1",
"version": "1.7.10R0.2.2B1",
"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