Skip to content

Commit

Permalink
2.3.8 release. :)
Browse files Browse the repository at this point in the history
Signed-off-by: King Lemming <kinglemming@gmail.com>
  • Loading branch information
KingLemming committed Dec 24, 2017
1 parent f8ca327 commit 759a79b
Show file tree
Hide file tree
Showing 20 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dependencies {
compile "cofh:CoFHCore:${config.mc_version}-${config.cofh_core_version}:deobf"
}

version = "${project.config.mod_version}." + (System.getenv("BUILD_NUMBER") ?: "19")
version = "${project.config.mod_version}." + (System.getenv("BUILD_NUMBER") ?: "22")

println config.mc_version + "-" + config.forge_version
// Setup the Forge/Minecraft plugin data. Specify the preferred Forge/Minecraft version here.
Expand Down
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ mod_version=2.3.8
rf_mc_version=1.12
rf_version=2.0.1.+
cofh_core_version=4.3.8.+
cofh_world_version=1.0.2.+
cofh_world_version=1.1.0.+
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package cofh.thermalfoundation.render.entity;

import cofh.core.util.helpers.HolidayHelper;
import cofh.thermalfoundation.entity.monster.EntityBasalz;
import cofh.thermalfoundation.render.model.ModelElemental;
import net.minecraft.client.renderer.entity.RenderLiving;
Expand All @@ -12,9 +13,11 @@
public class RenderEntityBasalz extends RenderLiving<EntityBasalz> {

private static ResourceLocation texture;
private static ResourceLocation textureXmas;

static {
texture = new ResourceLocation("thermalfoundation:textures/entity/" + "basalz.png");
textureXmas = new ResourceLocation("thermalfoundation:textures/entity/" + "basalz_xmas.png");
}

public RenderEntityBasalz(RenderManager renderManager) {
Expand All @@ -25,7 +28,7 @@ public RenderEntityBasalz(RenderManager renderManager) {
@Override
protected ResourceLocation getEntityTexture(EntityBasalz entity) {

return texture;
return HolidayHelper.isChristmas(5, 3) ? textureXmas : texture;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package cofh.thermalfoundation.render.entity;

import cofh.core.util.helpers.HolidayHelper;
import cofh.thermalfoundation.entity.monster.EntityBlitz;
import cofh.thermalfoundation.render.model.ModelElemental;
import net.minecraft.client.renderer.entity.RenderLiving;
Expand All @@ -12,9 +13,11 @@
public class RenderEntityBlitz extends RenderLiving<EntityBlitz> {

private static ResourceLocation texture;
private static ResourceLocation textureXmas;

static {
texture = new ResourceLocation("thermalfoundation:textures/entity/" + "blitz.png");
textureXmas = new ResourceLocation("thermalfoundation:textures/entity/" + "blitz_xmas.png");
}

public RenderEntityBlitz(RenderManager manager) {
Expand All @@ -25,7 +28,7 @@ public RenderEntityBlitz(RenderManager manager) {
@Override
protected ResourceLocation getEntityTexture(EntityBlitz par1Entity) {

return texture;
return HolidayHelper.isChristmas(5, 3) ? textureXmas : texture;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public RenderEntityBlizz(RenderManager renderManager) {
@Override
protected ResourceLocation getEntityTexture(EntityBlizz par1Entity) {

return HolidayHelper.isChristmas() ? textureXmas : texture;
return HolidayHelper.isChristmas(5, 3) ? textureXmas : texture;
}

@Override
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 759a79b

Please sign in to comment.