Skip to content
This repository was archived by the owner on Aug 7, 2023. It is now read-only.

Commit

Permalink
Add Chert Golem
Browse files Browse the repository at this point in the history 
And re-enable Diorite Golem
  • Loading branch information
@skyjay1
skyjay1 committed Nov 14, 2019
1 parent 52251d1 commit c7c675f
Show file tree
Hide file tree
Showing 15 changed files with 181 additions and 90 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ javadoc {



version = "7.1.7-0"
version = "7.1.7-2"
group= "golems_mineralogy"
archivesBaseName = "MineralogyGolemsAddon-1.12"

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/golems_mineralogy/entity/EntityPhosphorousGolem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class EntityPhosphorousGolem extends MineralGolemBase {
private boolean allowBurn;

public EntityPhosphorousGolem(World world) {
super(world, MGolemNames.PHOSPHOROUS);
super(world, MGolemNames.PHOSPHOROUS_GOLEM);
this.allowBurn = getConfig(this).getBoolean(ALLOW_SPECIAL);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/golems_mineralogy/entity/EntityQuartziteGolem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
public class EntityQuartziteGolem extends MineralGolemBase {

public EntityQuartziteGolem(World world) {
super(world, MGolemNames.QUARTZITE);
super(world, MGolemNames.QUARTZITE_GOLEM);

}

Expand All @@ -29,7 +29,7 @@ protected void damageEntity(final DamageSource source, final float amount) {

@Override
public List<String> addSpecialDesc(final List<String> list) {
list.add(TextFormatting.AQUA + trans("enchantment.minecraft.thorns") + " " + trans("enchantment.level.1"));
list.add(TextFormatting.AQUA + trans("enchantment.thorns") + " " + TextFormatting.AQUA + trans("enchantment.level.1"));
return list;
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/golems_mineralogy/entity/EntityRockSaltGolem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class EntityRockSaltGolem extends MineralGolemBase {
private boolean allowSpecial;

public EntityRockSaltGolem(World world) {
super(world, MGolemNames.ROCK_SALT);
super(world, MGolemNames.ROCK_SALT_GOLEM);
final GolemConfigSet cfg = getConfig(this);
allowSpecial = cfg.getBoolean(ALLOW_SPECIAL);
final IBlockState state = GolemItems.blockLightSource.getDefaultState()
Expand Down
58 changes: 32 additions & 26 deletions src/main/java/com/golems_mineralogy/entity/MineralGolemBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,161 +61,167 @@ protected void setKnockback(final double knockbackResist) {

public static class EntityAmphiboliteGolem extends MineralGolemBase {
public EntityAmphiboliteGolem(World world) {
super(world, MGolemNames.AMPHIBOLITE);
super(world, MGolemNames.AMPHIBOLITE_GOLEM);
}
}

public static class EntityAndesiteGolem extends MineralGolemBase {
public EntityAndesiteGolem(World world) {
super(world, MGolemNames.ANDESITE);
super(world, MGolemNames.ANDESITE_GOLEM);
}
}

public static class EntityBasaltGolem extends MineralGolemBase {
public EntityBasaltGolem(World world) {
super(world, MGolemNames.BASALT);
super(world, MGolemNames.BASALT_GOLEM);
this.setImmuneToFire(true);
this.setKnockback(0.85D);
}
}

public static class EntityBasalticGlassGolem extends MineralGolemBase {
public EntityBasalticGlassGolem(World world) {
super(world, MGolemNames.BASALTIC_GLASS);
super(world, MGolemNames.BASALTIC_GLASS_GOLEM);
this.setImmuneToFire(true);
}
}

public static class EntityChertGolem extends MineralGolemBase {
public EntityChertGolem(World world) {
super(world, MGolemNames.CHERT_GOLEM);
}
}

public static class EntityConglomerateGolem extends MineralGolemBase {
public EntityConglomerateGolem(World world) {
super(world, MGolemNames.CONGLOMERATE);
super(world, MGolemNames.CONGLOMERATE_GOLEM);
}
}

public static class EntityDiabaseGolem extends MineralGolemBase {
public EntityDiabaseGolem(World world) {
super(world, MGolemNames.DIABASE);
super(world, MGolemNames.DIABASE_GOLEM);
this.setImmuneToFire(true);
this.setKnockback(0.8D);
}
}

public static class EntityDioriteGolem extends MineralGolemBase {
public EntityDioriteGolem(World world) {
super(world, MGolemNames.DIORITE);
super(world, MGolemNames.DIORITE_GOLEM);
}
}

public static class EntityDolomiteGolem extends MineralGolemBase {
public EntityDolomiteGolem(World world) {
super(world, MGolemNames.DOLOMITE);
super(world, MGolemNames.DOLOMITE_GOLEM);
}
}

public static class EntityGabbroGolem extends MineralGolemBase {
public EntityGabbroGolem(World world) {
super(world, MGolemNames.GABBRO);
super(world, MGolemNames.GABBRO_GOLEM);
this.setImmuneToFire(true);
this.setKnockback(0.8D);
}
}

public static class EntityGneissGolem extends MineralGolemBase {
public EntityGneissGolem(World world) {
super(world, MGolemNames.GNEISS);
super(world, MGolemNames.GNEISS_GOLEM);
this.setImmuneToFire(true);
}
}

public static class EntityGraniteGolem extends MineralGolemBase {
public EntityGraniteGolem(World world) {
super(world, MGolemNames.GRANITE);
super(world, MGolemNames.GRANITE_GOLEM);
}
}

public static class EntityHornfelsGolem extends MineralGolemBase {
public EntityHornfelsGolem(World world) {
super(world, MGolemNames.HORNFELS);
super(world, MGolemNames.HORNFELS_GOLEM);
}
}

public static class EntityLimestoneGolem extends MineralGolemBase {
public EntityLimestoneGolem(World world) {
super(world, MGolemNames.LIMESTONE);
super(world, MGolemNames.LIMESTONE_GOLEM);
}
}

public static class EntityMarbleGolem extends MineralGolemBase {
public EntityMarbleGolem(World world) {
super(world, MGolemNames.MARBLE);
super(world, MGolemNames.MARBLE_GOLEM);
}
}

public static class EntityNovaculiteGolem extends MineralGolemBase {
public EntityNovaculiteGolem(World world) {
super(world, MGolemNames.NOVACULITE);
super(world, MGolemNames.NOVACULITE_GOLEM);
}
}

public static class EntityPegmatiteGolem extends MineralGolemBase {
public EntityPegmatiteGolem(World world) {
super(world, MGolemNames.PEGMATITE);
super(world, MGolemNames.PEGMATITE_GOLEM);
this.setImmuneToFire(true);
}
}

public static class EntityPeridotiteGolem extends MineralGolemBase {
public EntityPeridotiteGolem(World world) {
super(world, MGolemNames.PERIDOTITE);
super(world, MGolemNames.PERIDOTITE_GOLEM);
}
}

public static class EntityPhylliteGolem extends MineralGolemBase {
public EntityPhylliteGolem(World world) {
super(world, MGolemNames.PHYLLITE);
super(world, MGolemNames.PHYLLITE_GOLEM);
}
}

public static class EntityRhyoliteGolem extends MineralGolemBase {
public EntityRhyoliteGolem(World world) {
super(world, MGolemNames.RHYOLITE);
super(world, MGolemNames.RHYOLITE_GOLEM);
}
}

public static class EntitySchistGolem extends MineralGolemBase {
public EntitySchistGolem(World world) {
super(world, MGolemNames.SCHIST);
super(world, MGolemNames.SCHIST_GOLEM);
}
}

public static class EntityScoriaGolem extends MineralGolemBase {
public EntityScoriaGolem(World world) {
super(world, MGolemNames.SCORIA);
super(world, MGolemNames.SCORIA_GOLEM);
this.setCanSwim(true);
}
}

public static class EntityShaleGolem extends MineralGolemBase {
public EntityShaleGolem(World world) {
super(world, MGolemNames.SHALE);
super(world, MGolemNames.SHALE_GOLEM);
}
}

public static class EntitySiltstoneGolem extends MineralGolemBase {
public EntitySiltstoneGolem(World world) {
super(world, MGolemNames.SILTSTONE);
super(world, MGolemNames.SILTSTONE_GOLEM);
}
}

public static class EntitySlateGolem extends MineralGolemBase {
public EntitySlateGolem(World world) {
super(world, MGolemNames.SLATE);
super(world, MGolemNames.SLATE_GOLEM);
}
}

public static class EntitySulfurGolem extends MineralGolemBase {
public EntitySulfurGolem(World world) {
super(world, MGolemNames.SULFUR);
super(world, MGolemNames.SULFUR_GOLEM);
}

@Override
Expand All @@ -226,7 +232,7 @@ protected EnumParticleTypes getParticle() {

public static class EntityTuffGolem extends MineralGolemBase {
public EntityTuffGolem(World world) {
super(world, MGolemNames.TUFF);
super(world, MGolemNames.TUFF_GOLEM);
}
}
}
1 change: 1 addition & 0 deletions src/main/java/com/golems_mineralogy/init/InterModComm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ private InterModComm() { }
public static final String ANDESITE = "andesite";
public static final String BASALT = "basalt";
public static final String BASALTIC_GLASS = "basaltic_glass";
public static final String CHERT = "chert";
public static final String CONGLOMERATE = "conglomerate";
public static final String DIABASE = "diabase";
public static final String DIORITE = "diorite";
Expand Down
59 changes: 30 additions & 29 deletions src/main/java/com/golems_mineralogy/init/MGolemNames.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,34 @@ private MGolemNames() { }

private static final String PRE = "golem_";
// MINERALOGY STONE GOLEM NAMES
public static final String AMPHIBOLITE = PRE.concat(InterModComm.AMPHIBOLITE);
public static final String ANDESITE = PRE.concat(InterModComm.ANDESITE);
public static final String BASALT = PRE.concat(InterModComm.BASALT);
public static final String BASALTIC_GLASS = PRE.concat(InterModComm.BASALTIC_GLASS);
public static final String CONGLOMERATE = PRE.concat(InterModComm.CONGLOMERATE);
public static final String DIABASE = PRE.concat(InterModComm.DIABASE);
public static final String DIORITE = PRE.concat(InterModComm.DIORITE);
public static final String DOLOMITE = PRE.concat(InterModComm.DOLOMITE);
public static final String GABBRO = PRE.concat(InterModComm.GABBRO);
public static final String GNEISS = PRE.concat(InterModComm.GNEISS);
public static final String GRANITE = PRE.concat(InterModComm.GRANITE);
public static final String HORNFELS = PRE.concat(InterModComm.HORNFELS);
public static final String LIMESTONE = PRE.concat(InterModComm.LIMESTONE);
public static final String MARBLE = PRE.concat(InterModComm.MARBLE);
public static final String NOVACULITE = PRE.concat(InterModComm.NOVACULITE);
public static final String PEGMATITE = PRE.concat(InterModComm.PEGMATITE);
public static final String PERIDOTITE = PRE.concat(InterModComm.PERIDOTITE);
public static final String PHOSPHOROUS = PRE.concat(InterModComm.PHOSPHORUS);
public static final String PHYLLITE = PRE.concat(InterModComm.PHYLLITE);
public static final String QUARTZITE = PRE.concat(InterModComm.QUARTZITE);
public static final String RHYOLITE = PRE.concat(InterModComm.RHYOLITE);
public static final String ROCK_SALT = PRE.concat(InterModComm.ROCK_SALT);
public static final String SCHIST = PRE.concat(InterModComm.SCHIST);
public static final String SCORIA = PRE.concat(InterModComm.SCORIA);
public static final String SHALE = PRE.concat(InterModComm.SHALE);
public static final String SILTSTONE = PRE.concat(InterModComm.SILTSTONE);
public static final String SLATE = PRE.concat(InterModComm.SLATE);
public static final String SULFUR = PRE.concat(InterModComm.SULFUR);
public static final String TUFF = PRE.concat(InterModComm.TUFF);
public static final String AMPHIBOLITE_GOLEM = PRE.concat(InterModComm.AMPHIBOLITE);
public static final String ANDESITE_GOLEM = PRE.concat(InterModComm.ANDESITE);
public static final String BASALT_GOLEM = PRE.concat(InterModComm.BASALT);
public static final String BASALTIC_GLASS_GOLEM = PRE.concat(InterModComm.BASALTIC_GLASS);
public static final String CHERT_GOLEM = PRE.concat(InterModComm.CHERT);
public static final String CONGLOMERATE_GOLEM = PRE.concat(InterModComm.CONGLOMERATE);
public static final String DIABASE_GOLEM = PRE.concat(InterModComm.DIABASE);
public static final String DIORITE_GOLEM = PRE.concat(InterModComm.DIORITE);
public static final String DOLOMITE_GOLEM = PRE.concat(InterModComm.DOLOMITE);
public static final String GABBRO_GOLEM = PRE.concat(InterModComm.GABBRO);
public static final String GNEISS_GOLEM = PRE.concat(InterModComm.GNEISS);
public static final String GRANITE_GOLEM = PRE.concat(InterModComm.GRANITE);
public static final String HORNFELS_GOLEM = PRE.concat(InterModComm.HORNFELS);
public static final String LIMESTONE_GOLEM = PRE.concat(InterModComm.LIMESTONE);
public static final String MARBLE_GOLEM = PRE.concat(InterModComm.MARBLE);
public static final String NOVACULITE_GOLEM = PRE.concat(InterModComm.NOVACULITE);
public static final String PEGMATITE_GOLEM = PRE.concat(InterModComm.PEGMATITE);
public static final String PERIDOTITE_GOLEM = PRE.concat(InterModComm.PERIDOTITE);
public static final String PHOSPHOROUS_GOLEM = PRE.concat(InterModComm.PHOSPHORUS);
public static final String PHYLLITE_GOLEM = PRE.concat(InterModComm.PHYLLITE);
public static final String QUARTZITE_GOLEM = PRE.concat(InterModComm.QUARTZITE);
public static final String RHYOLITE_GOLEM = PRE.concat(InterModComm.RHYOLITE);
public static final String ROCK_SALT_GOLEM = PRE.concat(InterModComm.ROCK_SALT);
public static final String SCHIST_GOLEM = PRE.concat(InterModComm.SCHIST);
public static final String SCORIA_GOLEM = PRE.concat(InterModComm.SCORIA);
public static final String SHALE_GOLEM = PRE.concat(InterModComm.SHALE);
public static final String SILTSTONE_GOLEM = PRE.concat(InterModComm.SILTSTONE);
public static final String SLATE_GOLEM = PRE.concat(InterModComm.SLATE);
public static final String SULFUR_GOLEM = PRE.concat(InterModComm.SULFUR);
public static final String TUFF_GOLEM = PRE.concat(InterModComm.TUFF);
}
2 changes: 1 addition & 1 deletion src/main/java/com/golems_mineralogy/init/MineralogyGolems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class MineralogyGolems {
public static final String MODID = "golems_mineralogy";
public static final String DEPENDENCIES = "required:forge@[14.23.4.2768,);required-after:golems@[7.1.6,);required-after:mineralogy@[3.8.0.53,)";
public static final String NAME = "Mineralogy Golems";
public static final String VERSION = "7.1.7-1";
public static final String VERSION = "7.1.7-2";
public static final String MCVERSION = "1.12.2";

@Mod.Instance(MineralogyGolems.MODID)
Expand Down
Loading

0 comments on commit c7c675f

Please sign in to comment.