diff --git a/changelog b/changelog index 1f0e42906..1cda4a909 100644 --- a/changelog +++ b/changelog @@ -19,4 +19,5 @@ * Fixed containment box being able to contain itself when using the number keys, crashing the game * Fixed a critical game-breaking error where the custom tool's ability toggle is misspelled * (Hopefully) fixed the vampire ability not firing the onDeath event, causing the target to not drop any items and any death releated events to not happen -* Fixed water creatures vomitting when irradiated, when they logically shouldn't \ No newline at end of file +* Fixed water creatures vomitting when irradiated, when they logically shouldn't +* Fixed arc welder recipe template file not being generated properly \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/recipes/ArcWelderRecipes.java b/src/main/java/com/hbm/inventory/recipes/ArcWelderRecipes.java index 8591f971c..5a6152721 100644 --- a/src/main/java/com/hbm/inventory/recipes/ArcWelderRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ArcWelderRecipes.java @@ -171,6 +171,7 @@ public class ArcWelderRecipes extends SerializableRecipe { this.writeFluidStack(recipe.fluid, writer); } + writer.name("output"); this.writeItemStack(recipe.output, writer); writer.name("duration").value(recipe.duration); diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index 650c36270..7e3226470 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -1291,7 +1291,7 @@ public class ModEventHandlerClient { case 0: main.splashText = "Floppenheimer!"; break; case 1: main.splashText = "i should dip my balls in sulfuric acid"; break; case 2: main.splashText = "All answers are popbob!"; break; - case 3: main.splashText = "None shall enter The Orb!"; break; + case 3: main.splashText = "None may enter The Orb!"; break; case 4: main.splashText = "Wacarb was here"; break; case 5: main.splashText = "SpongeBoy me Bob I am overdosing on keramine agagagagaga"; break; case 6: main.splashText = EnumChatFormatting.RED + "I know where you live, " + System.getProperty("user.name"); break; @@ -1300,10 +1300,10 @@ public class ModEventHandlerClient { case 9: main.splashText = "There are bugs under your skin!"; break; case 10: main.splashText = "Fentanyl!"; break; case 11: main.splashText = "Do drugs!"; break; - //case 12: main.splashText = "post this on r/feedthememes for free internet points!"; break; + case 12: main.splashText = "Imagine being scared by splash texts!"; break; } - if(Math.random() < 0.1) main.splashText = "Visit r/feedthebeast if you hate yourself!"; + if(Math.random() < 0.1) main.splashText = "Redditors aren't people!"; } } }