fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Organise texture folders and misc cleanup

Browse Source
This commit is contained in:
Electroblob77
2020-04-10 00:17:01 +01:00
parent 793ba0eb05
commit a4fd88f21d
128 changed files with 125 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/potion/CurseEnfeeblement.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class CurseEnfeeblement extends Curse {
}
public CurseEnfeeblement(boolean isBadEffect, int liquiidColour){
super(isBadEffect, liquiidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_curse_of_enfeeblement.png"));
super(isBadEffect, liquiidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/curse_of_enfeeblement.png"));
// This needs to be here because registerPotionAttributeModifier doesn't like it if the potion has no name yet.
this.setPotionName("potion." + Wizardry.MODID + ":curse_of_enfeeblement");
this.registerPotionAttributeModifier(SharedMonsterAttributes.MAX_HEALTH,
src/main/java/electroblob/wizardry/potion/CurseUndeath.java
+1 -1
View File
@@ -10,7 +10,7 @@ import net.minecraft.util.math.BlockPos;
public class CurseUndeath extends Curse {
public CurseUndeath(boolean isBadEffect, int liquiidColour){
super(isBadEffect, liquiidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_curse_of_undeath.png"));
super(isBadEffect, liquiidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/curse_of_undeath.png"));
// This needs to be here because registerPotionAttributeModifier doesn't like it if the potion has no name yet.
this.setPotionName("potion." + Wizardry.MODID + ":curse_of_undeath");
}
src/main/java/electroblob/wizardry/potion/PotionContainment.java
+1 -1
View File
@@ -21,7 +21,7 @@ public class PotionContainment extends PotionMagicEffect {
public static final String ENTITY_TAG = "containmentPos";
public PotionContainment(boolean isBadEffect, int liquidColour){
super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_containment.png"));
super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/containment.png"));
this.setPotionName("potion." + Wizardry.MODID + ":containment");
}
src/main/java/electroblob/wizardry/potion/PotionDecay.java
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.List;
public class PotionDecay extends PotionMagicEffect {
public PotionDecay(boolean isBadEffect, int liquidColour){
super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_decay.png"));
super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/decay.png"));
// This needs to be here because registerPotionAttributeModifier doesn't like it if the potion has no name yet.
this.setPotionName("potion." + Wizardry.MODID + ":decay");
this.registerPotionAttributeModifier(SharedMonsterAttributes.MOVEMENT_SPEED,
src/main/java/electroblob/wizardry/potion/PotionFrost.java
+1 -1
View File
@@ -16,7 +16,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
public class PotionFrost extends PotionMagicEffect implements ICustomPotionParticles {
public PotionFrost(boolean isBadEffect, int liquidColour){
super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_frost.png"));
super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/frost.png"));
// This needs to be here because registerPotionAttributeModifier doesn't like it if the potion has no name yet.
this.setPotionName("potion." + Wizardry.MODID + ":frost");
// With -0.5 as the 'amount', frost 1 slows the entity down by a half and frost 2 roots it to the spot
src/main/java/electroblob/wizardry/potion/PotionFrostStep.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class PotionFrostStep extends PotionMagicEffect implements ICustomPotionP
private static final Field prevBlockPos = ObfuscationReflectionHelper.findField(EntityLivingBase.class, "field_184620_bC");
public PotionFrostStep(boolean isBadEffect, int liquidColour){
super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_frost_step.png"));
super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/frost_step.png"));
this.setPotionName("potion." + Wizardry.MODID + ":frost_step");
}
src/main/java/electroblob/wizardry/potion/PotionSlowTime.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class PotionSlowTime extends PotionMagicEffect implements ISyncedPotion {
public static final String NBT_KEY = "time_slowed";
public PotionSlowTime(boolean isBadEffect, int liquidColour){
super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_slow_time.png"));
super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/slow_time.png"));
this.setPotionName("potion." + Wizardry.MODID + ":slow_time");
}