Skip to content

Commit

Permalink
1.5.8.10
Browse files Browse the repository at this point in the history
  • Loading branch information
jtrent238 committed Dec 25, 2017
1 parent de13964 commit 2bd9302
Show file tree
Hide file tree
Showing 57 changed files with 6,048 additions and 825 deletions.
13 changes: 13 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
Epic Proportions Mod ChangeLog

1.5.8.10
- Added Achievement for Big Snowball [Christmas Addon]
- Added Gingerbread Carpet [Christmas Addon]
- Added Gingerbread House Structure [Christmas Addon]
- Added Christmas Painting [Christmas Addon]
- Fixed Big Snowball rendering [Christmas Addon]
- Fixed Snow Wand not throwing Snowballs [Christmas Addon]
- Fixed Frosted Glass Break Sound [Christmas Addon]
- Fixed Frosted Glass Pane Break Sound [Christmas Addon]
- Removed Gingerbread Door [Christmas Addon]
- Removed Red Christmas Presents [Christmas Addon]
- Changed the Hurt and Death sounds for Fred 2.0

1.5.8.9
- Removed Trophy Support for ObsTrophies [Now Requires MoreTrophies]
- Added Cow Halloween Pail [Halloween Addon]
Expand Down
63 changes: 63 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
}
}

apply plugin: 'forge'

version = "1.5.8.10"
group= "com.jtrent238.epicproportionsmod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "epicproportionsmod"

minecraft {
version = "1.7.10-10.13.4.1448-1.7.10"
runDir = "eclipse"
}

dependencies {
// you may put jars on which you depend on in ./libs
// or you may define them like so..
//compile "some.group:artifact:version:classifier"
//compile "some.group:artifact:version"

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

// for more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html

}

processResources
{
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version

// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'

// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}

// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
63 changes: 63 additions & 0 deletions src/main/java/com/jtrent238/epicproportions/AddonManager.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package com.jtrent238.epicproportions;

import java.util.ArrayList;

import cpw.mods.fml.common.Loader;

public class AddonManager {

static ArrayList<String> AddonName = new ArrayList<String>();
static ArrayList<String> AddonId = new ArrayList<String>();
static ArrayList<String> AddonVersion = new ArrayList<String>();
static ArrayList<String> AddonAuthor = new ArrayList<String>();

private static boolean halloweenloaded;
private static boolean christmasloaded;

private static String name= "Addon Name: ";
private static String id= "Addon ID: ";
private static String version= "Addon Version: ";
private static String author= "Addon Author: ";


public static void registerAddons() {

//Halloween Addon
if(Loader.isModLoaded("epicproportionsmod_halloween")){
//Halloween Addon
AddonName.add(0, "Halloween Addon");
AddonId.add(0, "epicproportionsmod_halloween");
AddonVersion.add(0, "1.0.1.1");
AddonAuthor.add(0, "jtrent238");
halloweenloaded = true;
}
else
System.out.println("Halloween Addon NOT FOUND!!!");

//Christmas Addon
if(Loader.isModLoaded("epicproportionsmod_christmas")){
AddonName.add(1, "Christmas Addon");
AddonId.add(1, "epicproportionsmod_christmas");
AddonVersion.add(1, "1.0.0.0");
AddonAuthor.add(1, "jtrent238");
christmasloaded = true;
}
else
System.out.println("Christmas Addon NOT FOUND!!!");

if(halloweenloaded == true){
System.out.println(AddonName.get(0) + " FOUND");
System.out.println(name + AddonName.get(0));
System.out.println(id + AddonId.get(0));
System.out.println(version + AddonVersion.get(0));
System.out.println(author + AddonAuthor.get(0));
}
if(christmasloaded == true){
System.out.println(AddonName.get(1) + " FOUND");
System.out.println(name + AddonName.get(1));
System.out.println(id + AddonId.get(1));
System.out.println(version + AddonVersion.get(1));
System.out.println(author + AddonAuthor.get(1));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.logging.Level;
Expand Down Expand Up @@ -118,7 +119,7 @@ public class EpicProportionsMod implements ITweaker
@Instance(MODID)
public static EpicProportionsMod instance;

public static final String MODVERSION = "1.5.8.9";
public static final String MODVERSION = "1.5.8.10";

public static final String APIVERSION = "1.0.0.0";
public static final String MODNAME = "jtrent238's EpicProportions Mod";
Expand Down Expand Up @@ -348,6 +349,8 @@ public void preInit(FMLPreInitializationEvent event) throws IOException
//patbiome.preInit(event);
//dimepicproportions.preInit(event);
//***********************************************************************************

AddonManager.registerAddons();
/*
* Is Mods Loaded Start
*/
Expand Down Expand Up @@ -667,10 +670,10 @@ class MaxMemory {
//Dimension.registerDimensions();
//FluidLoader.RegisterFluids();

EntityRegistry.registerModEntity(EntityNinjaStar.class, "NinjaStar", 4, MODID, 80, 3, true);
EntityRegistry.registerModEntity(EntityLuckyEgg.class, "LuckyEgg", 5, MODID, 80, 3, true);
EntityRegistry.registerModEntity(EntilyPatArrow.class, "PatArrow", 6, MODID, 80, 3, true);
EntityRegistry.registerModEntity(EntilyJenArrow.class, "PatArrow", 7, MODID, 80, 3, true);
EntityRegistry.registerModEntity(EntityNinjaStar.class, "NinjaStar", EntityRegistry.findGlobalUniqueEntityId(), MODID, 80, 3, true);
EntityRegistry.registerModEntity(EntityLuckyEgg.class, "LuckyEgg", EntityRegistry.findGlobalUniqueEntityId(), MODID, 80, 3, true);
EntityRegistry.registerModEntity(EntilyPatArrow.class, "PatArrow", EntityRegistry.findGlobalUniqueEntityId(), MODID, 80, 3, true);
EntityRegistry.registerModEntity(EntilyJenArrow.class, "JenArrow", EntityRegistry.findGlobalUniqueEntityId(), MODID, 80, 3, true);


proxy.registerRenderThings();
Expand Down
127 changes: 72 additions & 55 deletions src/main/java/com/jtrent238/epicproportions/Joke.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.jtrent238.epicproportions;

import java.util.ArrayList;
import java.util.Random;

import cpw.mods.fml.common.eventhandler.SubscribeEvent;
Expand All @@ -8,70 +9,86 @@

public class Joke {

int askjoke;
String Joke_Ask;
String Joke_Answer;
private String jokeNumber;
static ArrayList<String> JokeAsk = new ArrayList<String>();
static ArrayList<String> JokeAnswer = new ArrayList<String>();



public Joke(int jokeNumber) {
public void jokes(){
JokeAsk.add(0, "What did Steve say when he was angry at a skeleton?");
JokeAnswer.add(0, "I’ve got a bone to pick with you!");

askjoke = jokeNumber;
}



public int getJoke() {
JokeAsk.add(1, "What do skeletons order at the village restaurant?");
JokeAnswer.add(1, "Spare ribs");

return askjoke;
}
JokeAsk.add(2, "What kind of makeup do witches wear?");
JokeAnswer.add(2, "Mas-scare-a");

JokeAsk.add(3, "What did the zombie say to the villager?");
JokeAnswer.add(3, "Nice to eat you.");

JokeAsk.add(4, "Do you hear about the Minecraft movie?");
JokeAnswer.add(4, "It’s a blockbuster.");

JokeAsk.add(5, "What is a Creepers favorite food?");
JokeAnswer.add(5, "Ssssssssalad");

JokeAsk.add(6, "Why can’t the Ender Dragon ever understand a book?");
JokeAnswer.add(6, "Because he always starts at the end.");

JokeAsk.add(7, "How are ocelots like m&m’s?");
JokeAnswer.add(7, "You can’t just have one.");

JokeAsk.add(8, "What do witches put in their hair?");
JokeAnswer.add(8, "Scare spray");

JokeAsk.add(9, "Why didn’t the enderman cross the road?");
JokeAnswer.add(9, "Because he teleported.");

JokeAsk.add(10, "How do zombies get so good at Minecraft?");
JokeAnswer.add(10, "DEADication.");

JokeAsk.add(11, "Where does Steve rent movies?");
JokeAnswer.add(11, "Blockbuster");

JokeAsk.add(12, "What did Charlie Brown say when Steve broke his baseball bat?");
JokeAnswer.add(12, "You Blockhead!");

JokeAsk.add(13, "What kind of parties do Minecraft players have?");
JokeAnswer.add(13, "Block parties.");

JokeAsk.add(14, "What is Cobblestone’s favorite type of music?");
JokeAnswer.add(14, "Rock music.");

JokeAsk.add(15, "Why did the Creeper cross the road?");
JokeAnswer.add(15, "To get to the other Sssssssssside");

JokeAsk.add(16, "Where do miners sleep?");
JokeAnswer.add(16, "On their bed-rocks");

JokeAsk.add(17, "What was the name of the Minecraft boy band?");
JokeAnswer.add(17, "New Kids on the Block.");

JokeAsk.add(18, "Why can’t you score against Minecraft basketball players?");
JokeAnswer.add(18, "They know how to block.");

JokeAsk.add(19, "Why didn’t the skeleton like to fly?");
JokeAnswer.add(19, "He had no guts");

JokeAsk.add(20, "Why aren’t there cars in Minecraft?");
JokeAnswer.add(20, "The streets are blocked off.");

//JokeAsk.add(0, "");
//JokeAnswer.add(0, "");


{

switch (askjoke){


case 0:
Joke_Ask = "What is invisible and smells like carrots?";
Joke_Answer = "Rabbit farts";

case 1:
Joke_Ask = "What did the worker at the rubber band factory say when he lost his job?";
Joke_Answer = "OH SNAP";

case 2:
Joke_Ask = "What do calendars eat?";
Joke_Answer = "DATES!";

case 3:
Joke_Ask = "How much does a pirate pay for corn?";
Joke_Answer = "A buccaneer!";

}

System.out.println(Joke_Ask);
System.out.println(Joke_Answer);


}


}
@SubscribeEvent
public void PlayerEvent(PlayerEvent event) {

event.player.addChatComponentMessage(new ChatComponentText("§b§lHello" + " " + "§e§l" + event.player.getDisplayName() + askjoke(1)));

}



private String askjoke(int i) {

return jokeNumber;
int minimum = 0;
double maximum = 21;
int index = minimum + (int)(Math.random() * maximum); ;
event.player.addChatComponentMessage(new ChatComponentText("§b§lHello" + " " + "§e§l" + event.player.getDisplayName() + JokeAsk.get(index)));
System.out.println(index);
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class Achievements {

private static final String modid = epicproportionsmod_christmas.MODID;
public static Achievement achievementJingleBells;
public static Achievement achievementBigSnowBall;



Expand All @@ -20,10 +21,13 @@ public class Achievements {
public static void loadAchievements()
{
achievementJingleBells = new Achievement("achievement." + modid + ".JingleBells", "JingleBells", 0, 0, new ItemStack(ItemLoader.ItemJingleBells, 1), (Achievement)achievementJingleBells).initIndependentStat().registerStat();
achievementBigSnowBall = new Achievement("achievement." + modid + ".BigSnowBalls", "BigSnowBalls", 1, 0, new ItemStack(ItemLoader.ItemGiantSnowball, 1), (Achievement)achievementBigSnowBall).initIndependentStat().registerStat();


AchievementPage.registerAchievementPage(new AchievementPage(epicproportionsmod_christmas.MODID + epicproportionsmod_christmas.MODVERSION + "Achievements", new Achievement[]{
achievementJingleBells
achievementJingleBells,
achievementBigSnowBall

}));

}
Expand Down
Loading

0 comments on commit 2bd9302

Please sign in to comment.