Skip to content

Commit 759a79b

Browse files
committed
2.3.8 release. :)
Signed-off-by: King Lemming <kinglemming@gmail.com>
1 parent f8ca327 commit 759a79b

20 files changed

+11
-5
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies {
5252
compile "cofh:CoFHCore:${config.mc_version}-${config.cofh_core_version}:deobf"
5353
}
5454

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

5757
println config.mc_version + "-" + config.forge_version
5858
// Setup the Forge/Minecraft plugin data. Specify the preferred Forge/Minecraft version here.

build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ mod_version=2.3.8
1010
rf_mc_version=1.12
1111
rf_version=2.0.1.+
1212
cofh_core_version=4.3.8.+
13-
cofh_world_version=1.0.2.+
13+
cofh_world_version=1.1.0.+

src/main/java/cofh/thermalfoundation/render/entity/RenderEntityBasalz.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cofh.thermalfoundation.render.entity;
22

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

1415
private static ResourceLocation texture;
16+
private static ResourceLocation textureXmas;
1517

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

2023
public RenderEntityBasalz(RenderManager renderManager) {
@@ -25,7 +28,7 @@ public RenderEntityBasalz(RenderManager renderManager) {
2528
@Override
2629
protected ResourceLocation getEntityTexture(EntityBasalz entity) {
2730

28-
return texture;
31+
return HolidayHelper.isChristmas(5, 3) ? textureXmas : texture;
2932
}
3033

3134
@Override

src/main/java/cofh/thermalfoundation/render/entity/RenderEntityBlitz.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cofh.thermalfoundation.render.entity;
22

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

1415
private static ResourceLocation texture;
16+
private static ResourceLocation textureXmas;
1517

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

2023
public RenderEntityBlitz(RenderManager manager) {
@@ -25,7 +28,7 @@ public RenderEntityBlitz(RenderManager manager) {
2528
@Override
2629
protected ResourceLocation getEntityTexture(EntityBlitz par1Entity) {
2730

28-
return texture;
31+
return HolidayHelper.isChristmas(5, 3) ? textureXmas : texture;
2932
}
3033

3134
@Override

src/main/java/cofh/thermalfoundation/render/entity/RenderEntityBlizz.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public RenderEntityBlizz(RenderManager renderManager) {
2828
@Override
2929
protected ResourceLocation getEntityTexture(EntityBlizz par1Entity) {
3030

31-
return HolidayHelper.isChristmas() ? textureXmas : texture;
31+
return HolidayHelper.isChristmas(5, 3) ? textureXmas : texture;
3232
}
3333

3434
@Override
1.34 KB
Loading
1.45 KB
Loading
59 Bytes
Loading
-83 Bytes
Loading
-56 Bytes
Loading

0 commit comments

Comments
 (0)