Skip to content

Commit 2bd9302

Browse files
jtrent238jtrent238
committed
1.5.8.10
1 parent de13964 commit 2bd9302

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+6048
-825
lines changed

‎ChangeLog.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
Epic Proportions Mod ChangeLog
22

3+
1.5.8.10
4+
- Added Achievement for Big Snowball [Christmas Addon]
5+
- Added Gingerbread Carpet [Christmas Addon]
6+
- Added Gingerbread House Structure [Christmas Addon]
7+
- Added Christmas Painting [Christmas Addon]
8+
- Fixed Big Snowball rendering [Christmas Addon]
9+
- Fixed Snow Wand not throwing Snowballs [Christmas Addon]
10+
- Fixed Frosted Glass Break Sound [Christmas Addon]
11+
- Fixed Frosted Glass Pane Break Sound [Christmas Addon]
12+
- Removed Gingerbread Door [Christmas Addon]
13+
- Removed Red Christmas Presents [Christmas Addon]
14+
- Changed the Hurt and Death sounds for Fred 2.0
15+
316
1.5.8.9
417
- Removed Trophy Support for ObsTrophies [Now Requires MoreTrophies]
518
- Added Cow Halloween Pail [Halloween Addon]

‎build.gradle‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
buildscript {
2+
repositories {
3+
mavenCentral()
4+
maven {
5+
name = "forge"
6+
url = "http://files.minecraftforge.net/maven"
7+
}
8+
maven {
9+
name = "sonatype"
10+
url = "https://oss.sonatype.org/content/repositories/snapshots/"
11+
}
12+
}
13+
dependencies {
14+
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
15+
}
16+
}
17+
18+
apply plugin: 'forge'
19+
20+
version = "1.5.8.10"
21+
group= "com.jtrent238.epicproportionsmod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
22+
archivesBaseName = "epicproportionsmod"
23+
24+
minecraft {
25+
version = "1.7.10-10.13.4.1448-1.7.10"
26+
runDir = "eclipse"
27+
}
28+
29+
dependencies {
30+
// you may put jars on which you depend on in ./libs
31+
// or you may define them like so..
32+
//compile "some.group:artifact:version:classifier"
33+
//compile "some.group:artifact:version"
34+
35+
// real examples
36+
//compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
37+
//compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
38+
39+
// for more info...
40+
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
41+
// http://www.gradle.org/docs/current/userguide/dependency_management.html
42+
43+
}
44+
45+
processResources
46+
{
47+
// this will ensure that this task is redone when the versions change.
48+
inputs.property "version", project.version
49+
inputs.property "mcversion", project.minecraft.version
50+
51+
// replace stuff in mcmod.info, nothing else
52+
from(sourceSets.main.resources.srcDirs) {
53+
include 'mcmod.info'
54+
55+
// replace version and mcversion
56+
expand 'version':project.version, 'mcversion':project.minecraft.version
57+
}
58+
59+
// copy everything else, thats not the mcmod.info
60+
from(sourceSets.main.resources.srcDirs) {
61+
exclude 'mcmod.info'
62+
}
63+
}

‎src/main/java/com/jtrent238/epicproportions/AddonManager.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
package com.jtrent238.epicproportions;
2+
3+
import java.util.ArrayList;
4+
5+
import cpw.mods.fml.common.Loader;
6+
7+
public class AddonManager {
8+
9+
static ArrayList<String> AddonName = new ArrayList<String>();
10+
static ArrayList<String> AddonId = new ArrayList<String>();
11+
static ArrayList<String> AddonVersion = new ArrayList<String>();
12+
static ArrayList<String> AddonAuthor = new ArrayList<String>();
13+
14+
private static boolean halloweenloaded;
15+
private static boolean christmasloaded;
16+
17+
private static String name= "Addon Name: ";
18+
private static String id= "Addon ID: ";
19+
private static String version= "Addon Version: ";
20+
private static String author= "Addon Author: ";
21+
22+
23+
public static void registerAddons() {
24+
25+
//Halloween Addon
26+
if(Loader.isModLoaded("epicproportionsmod_halloween")){
27+
//Halloween Addon
28+
AddonName.add(0, "Halloween Addon");
29+
AddonId.add(0, "epicproportionsmod_halloween");
30+
AddonVersion.add(0, "1.0.1.1");
31+
AddonAuthor.add(0, "jtrent238");
32+
halloweenloaded = true;
33+
}
34+
else
35+
System.out.println("Halloween Addon NOT FOUND!!!");
36+
37+
//Christmas Addon
38+
if(Loader.isModLoaded("epicproportionsmod_christmas")){
39+
AddonName.add(1, "Christmas Addon");
40+
AddonId.add(1, "epicproportionsmod_christmas");
41+
AddonVersion.add(1, "1.0.0.0");
42+
AddonAuthor.add(1, "jtrent238");
43+
christmasloaded = true;
44+
}
45+
else
46+
System.out.println("Christmas Addon NOT FOUND!!!");
47+
48+
if(halloweenloaded == true){
49+
System.out.println(AddonName.get(0) + " FOUND");
50+
System.out.println(name + AddonName.get(0));
51+
System.out.println(id + AddonId.get(0));
52+
System.out.println(version + AddonVersion.get(0));
53+
System.out.println(author + AddonAuthor.get(0));
54+
}
55+
if(christmasloaded == true){
56+
System.out.println(AddonName.get(1) + " FOUND");
57+
System.out.println(name + AddonName.get(1));
58+
System.out.println(id + AddonId.get(1));
59+
System.out.println(version + AddonVersion.get(1));
60+
System.out.println(author + AddonAuthor.get(1));
61+
}
62+
}
63+
}

‎src/main/java/com/jtrent238/epicproportions/EpicProportionsMod.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.io.IOException;
77
import java.io.InputStreamReader;
88
import java.io.Writer;
9+
import java.util.ArrayList;
910
import java.util.List;
1011
import java.util.Random;
1112
import java.util.logging.Level;
@@ -118,7 +119,7 @@ public class EpicProportionsMod implements ITweaker
118119
@Instance(MODID)
119120
public static EpicProportionsMod instance;
120121

121-
public static final String MODVERSION = "1.5.8.9";
122+
public static final String MODVERSION = "1.5.8.10";
122123

123124
public static final String APIVERSION = "1.0.0.0";
124125
public static final String MODNAME = "jtrent238's EpicProportions Mod";
@@ -348,6 +349,8 @@ public void preInit(FMLPreInitializationEvent event) throws IOException
348349
//patbiome.preInit(event);
349350
//dimepicproportions.preInit(event);
350351
//***********************************************************************************
352+
353+
AddonManager.registerAddons();
351354
/*
352355
* Is Mods Loaded Start
353356
*/
@@ -667,10 +670,10 @@ class MaxMemory {
667670
//Dimension.registerDimensions();
668671
//FluidLoader.RegisterFluids();
669672

670-
EntityRegistry.registerModEntity(EntityNinjaStar.class, "NinjaStar", 4, MODID, 80, 3, true);
671-
EntityRegistry.registerModEntity(EntityLuckyEgg.class, "LuckyEgg", 5, MODID, 80, 3, true);
672-
EntityRegistry.registerModEntity(EntilyPatArrow.class, "PatArrow", 6, MODID, 80, 3, true);
673-
EntityRegistry.registerModEntity(EntilyJenArrow.class, "PatArrow", 7, MODID, 80, 3, true);
673+
EntityRegistry.registerModEntity(EntityNinjaStar.class, "NinjaStar", EntityRegistry.findGlobalUniqueEntityId(), MODID, 80, 3, true);
674+
EntityRegistry.registerModEntity(EntityLuckyEgg.class, "LuckyEgg", EntityRegistry.findGlobalUniqueEntityId(), MODID, 80, 3, true);
675+
EntityRegistry.registerModEntity(EntilyPatArrow.class, "PatArrow", EntityRegistry.findGlobalUniqueEntityId(), MODID, 80, 3, true);
676+
EntityRegistry.registerModEntity(EntilyJenArrow.class, "JenArrow", EntityRegistry.findGlobalUniqueEntityId(), MODID, 80, 3, true);
674677

675678

676679
proxy.registerRenderThings();

‎src/main/java/com/jtrent238/epicproportions/Joke.java‎

Lines changed: 72 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.jtrent238.epicproportions;
22

3+
import java.util.ArrayList;
34
import java.util.Random;
45

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

910
public class Joke {
1011

11-
int askjoke;
12-
String Joke_Ask;
13-
String Joke_Answer;
14-
private String jokeNumber;
12+
static ArrayList<String> JokeAsk = new ArrayList<String>();
13+
static ArrayList<String> JokeAnswer = new ArrayList<String>();
1514

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

20-
askjoke = jokeNumber;
21-
}
22-
23-
24-
25-
public int getJoke() {
19+
JokeAsk.add(1, "What do skeletons order at the village restaurant?");
20+
JokeAnswer.add(1, "Spare ribs");
2621

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

25+
JokeAsk.add(3, "What did the zombie say to the villager?");
26+
JokeAnswer.add(3, "Nice to eat you.");
27+
28+
JokeAsk.add(4, "Do you hear about the Minecraft movie?");
29+
JokeAnswer.add(4, "It’s a blockbuster.");
30+
31+
JokeAsk.add(5, "What is a Creepers favorite food?");
32+
JokeAnswer.add(5, "Ssssssssalad");
33+
34+
JokeAsk.add(6, "Why can’t the Ender Dragon ever understand a book?");
35+
JokeAnswer.add(6, "Because he always starts at the end.");
36+
37+
JokeAsk.add(7, "How are ocelots like m&m’s?");
38+
JokeAnswer.add(7, "You can’t just have one.");
39+
40+
JokeAsk.add(8, "What do witches put in their hair?");
41+
JokeAnswer.add(8, "Scare spray");
42+
43+
JokeAsk.add(9, "Why didn’t the enderman cross the road?");
44+
JokeAnswer.add(9, "Because he teleported.");
45+
46+
JokeAsk.add(10, "How do zombies get so good at Minecraft?");
47+
JokeAnswer.add(10, "DEADication.");
48+
49+
JokeAsk.add(11, "Where does Steve rent movies?");
50+
JokeAnswer.add(11, "Blockbuster");
51+
52+
JokeAsk.add(12, "What did Charlie Brown say when Steve broke his baseball bat?");
53+
JokeAnswer.add(12, "You Blockhead!");
54+
55+
JokeAsk.add(13, "What kind of parties do Minecraft players have?");
56+
JokeAnswer.add(13, "Block parties.");
57+
58+
JokeAsk.add(14, "What is Cobblestone’s favorite type of music?");
59+
JokeAnswer.add(14, "Rock music.");
60+
61+
JokeAsk.add(15, "Why did the Creeper cross the road?");
62+
JokeAnswer.add(15, "To get to the other Sssssssssside");
63+
64+
JokeAsk.add(16, "Where do miners sleep?");
65+
JokeAnswer.add(16, "On their bed-rocks");
66+
67+
JokeAsk.add(17, "What was the name of the Minecraft boy band?");
68+
JokeAnswer.add(17, "New Kids on the Block.");
69+
70+
JokeAsk.add(18, "Why can’t you score against Minecraft basketball players?");
71+
JokeAnswer.add(18, "They know how to block.");
72+
73+
JokeAsk.add(19, "Why didn’t the skeleton like to fly?");
74+
JokeAnswer.add(19, "He had no guts");
75+
76+
JokeAsk.add(20, "Why aren’t there cars in Minecraft?");
77+
JokeAnswer.add(20, "The streets are blocked off.");
78+
79+
//JokeAsk.add(0, "");
80+
//JokeAnswer.add(0, "");
3081

31-
32-
{
33-
34-
switch (askjoke){
35-
36-
37-
case 0:
38-
Joke_Ask = "What is invisible and smells like carrots?";
39-
Joke_Answer = "Rabbit farts";
40-
41-
case 1:
42-
Joke_Ask = "What did the worker at the rubber band factory say when he lost his job?";
43-
Joke_Answer = "OH SNAP";
44-
45-
case 2:
46-
Joke_Ask = "What do calendars eat?";
47-
Joke_Answer = "DATES!";
48-
49-
case 3:
50-
Joke_Ask = "How much does a pirate pay for corn?";
51-
Joke_Answer = "A buccaneer!";
52-
53-
}
54-
55-
System.out.println(Joke_Ask);
56-
System.out.println(Joke_Answer);
57-
58-
59-
}
60-
61-
82+
}
6283
@SubscribeEvent
6384
public void PlayerEvent(PlayerEvent event) {
6485

65-
event.player.addChatComponentMessage(new ChatComponentText("§b§lHello" + " " + "§e§l" + event.player.getDisplayName() + askjoke(1)));
66-
67-
}
68-
6986

70-
71-
private String askjoke(int i) {
72-
73-
return jokeNumber;
87+
int minimum = 0;
88+
double maximum = 21;
89+
int index = minimum + (int)(Math.random() * maximum); ;
90+
event.player.addChatComponentMessage(new ChatComponentText("§b§lHello" + " " + "§e§l" + event.player.getDisplayName() + JokeAsk.get(index)));
91+
System.out.println(index);
7492
}
7593

76-
7794
}

‎src/main/java/com/jtrent238/epicproportions/addons/christmas/Achievements.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public class Achievements {
1010

1111
private static final String modid = epicproportionsmod_christmas.MODID;
1212
public static Achievement achievementJingleBells;
13+
public static Achievement achievementBigSnowBall;
1314

1415

1516

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

2426

2527
AchievementPage.registerAchievementPage(new AchievementPage(epicproportionsmod_christmas.MODID + epicproportionsmod_christmas.MODVERSION + "Achievements", new Achievement[]{
26-
achievementJingleBells
28+
achievementJingleBells,
29+
achievementBigSnowBall
30+
2731
}));
2832

2933
}

0 commit comments

Comments
 (0)