Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update GC lang files to more modern usage for MobInfo #83

Merged
merged 5 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
dependencies {
implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.01:dev')
implementation('com.github.GTNewHorizons:TinkersConstruct:1.11.0:dev')
implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.108:dev')
implementation('com.github.GTNewHorizons:TinkersConstruct:1.11.0-GTNH:dev')
implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev')
api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-302-GTNH:api')
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-303-GTNH:api')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.38:api')

compileOnly('curse.maven:cofh-lib-220333:2388748')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
import net.minecraft.launchwrapper.Launch;
import net.minecraft.util.StatCollector;

import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import micdoodle8.mods.galacticraft.core.GalacticraftCore;
import micdoodle8.mods.galacticraft.core.entities.EntityLanderBase;
import micdoodle8.mods.galacticraft.core.inventory.ContainerBuggy;
Expand Down Expand Up @@ -98,14 +95,8 @@ public static int getNextValidEggID() {
return eggID;
}

@SuppressWarnings("deprecation")
public static void registerGalacticraftNonMobEntity(Class<? extends Entity> var0, String var1, int trackingDistance,
int updateFreq, boolean sendVel) {
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
LanguageRegistry.instance().addStringLocalization(
"entity.GalacticraftCore." + var1 + ".name",
GCCoreUtil.translate("entity." + var1 + ".name"));
}
bombcar marked this conversation as resolved.
Show resolved Hide resolved
EntityRegistry.registerModEntity(
var0,
var1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;

import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartedEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import micdoodle8.mods.galacticraft.api.GalacticraftRegistry;
import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody;
Expand Down Expand Up @@ -284,14 +282,8 @@ public void registerGalacticraftCreature(Class<? extends Entity> var0, String va
}
}

@SuppressWarnings("deprecation")
public static void registerGalacticraftNonMobEntity(Class<? extends Entity> var0, String var1, int trackingDistance,
int updateFreq, boolean sendVel) {
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
LanguageRegistry.instance().addStringLocalization(
"entity.GalacticraftMars." + var1 + ".name",
GCCoreUtil.translate("entity." + var1 + ".name"));
}
EntityRegistry.registerModEntity(
var0,
var1,
Expand Down
32 changes: 16 additions & 16 deletions src/main/resources/assets/galacticraftcore/lang/cs_CZ.lang
Original file line number Diff line number Diff line change
Expand Up @@ -219,22 +219,22 @@ tile.crudeOil.name=Ropa
tile.fuelBlock.name=Palivo

# ENTITIES
entity.EvolvedSpider.name=Vyvinutý pavouk
entity.EvolvedZombie.name=Vyvinutý zombie
entity.EvolvedCreeper.name=Vyvinutý syčák
entity.EvolvedSkeleton.name=Vyvinutý kostlivec
entity.EvolvedSkeletonBoss.name=Vyvinutý kostlivec (Boss)
entity.AlienVillager.name=Mimozemšťan
entity.Spaceship.name=Raketa typ 1
entity.GravityArrow.name=Šíp
entity.Meteor.name=Meteorit
entity.Buggy.name=Bugina
entity.Flag.name=Vlajka
entity.ParaChest.name=Truhla na padáku
entity.OxygenBubble.name=Kyslíková bublina
entity.Lander.name=Přistávací modul
entity.GCFlag.name=Vlajka
entity.MeteorChunk.name=Úlomek meteoritu
entity.GalacticraftCore.AlienVillager.name=Mimozemšťan
entity.GalacticraftCore.Buggy.name=Bugina
entity.GalacticraftCore.EvolvedCreeper.name=Vyvinutý syčák
entity.GalacticraftCore.EvolvedSkeleton.name=Vyvinutý kostlivec
entity.GalacticraftCore.EvolvedSkeletonBoss.name=Vyvinutý kostlivec (Boss)
entity.GalacticraftCore.EvolvedSpider.name=Vyvinutý pavouk
entity.GalacticraftCore.EvolvedZombie.name=Vyvinutý zombie
entity.GalacticraftCore.Flag.name=Vlajka
entity.GalacticraftCore.GCFlag.name=Vlajka
entity.GalacticraftCore.GravityArrow.name=Šíp
entity.GalacticraftCore.Lander.name=Přistávací modul
entity.GalacticraftCore.Meteor.name=Meteorit
entity.GalacticraftCore.MeteorChunk.name=Úlomek meteoritu
entity.GalacticraftCore.OxygenBubble.name=Kyslíková bublina
entity.GalacticraftCore.ParaChest.name=Truhla na padáku
entity.GalacticraftCore.Spaceship.name=Raketa typ 1

# Schematics
schematic.moonbuggy.name=Bugina
Expand Down
32 changes: 16 additions & 16 deletions src/main/resources/assets/galacticraftcore/lang/cy_GB.lang
Original file line number Diff line number Diff line change
Expand Up @@ -220,22 +220,22 @@ tile.crudeOil.name=Oil ##NEEDS TRANSLATE##
tile.fuelBlock.name=Fuel ##NEEDS TRANSLATE##

# ENDIDAU
entity.EvolvedSpider.name = esblygu Spider
entity.EvolvedZombie.name = esblygu Zombie
entity.EvolvedCreeper.name = esblygu Dringwr Bach
entity.EvolvedSkeleton.name = esblygu Sgerbwd
entity.EvolvedSkeletonBoss.name = esblygu Sgerbwd Boss
entity.AlienVillager.name = Pentrefwr Alien
entity.Spaceship.name = Haen 1 Roced
entity.GravityArrow.name = Arrow
entity.Meteor.name = Meteor
entity.Buggy.name = Buggy
entity.Flag.name = Flag
entity.ParaChest.name = Parachest
entity.OxygenBubble.name = Ocsigen Bubble
entity.Lander.name = Gofod Lander
entity.GCFlag.name=Flag ##NEEDS TRANSLATE##
entity.MeteorChunk.name=Meteor Chunk ##NEEDS TRANSLATE##
entity.GalacticraftCore.AlienVillager.name=Pentrefwr Alien
entity.GalacticraftCore.Buggy.name=Buggy
entity.GalacticraftCore.EvolvedCreeper.name=esblygu Dringwr Bach
entity.GalacticraftCore.EvolvedSkeleton.name=esblygu Sgerbwd
entity.GalacticraftCore.EvolvedSkeletonBoss.name=esblygu Sgerbwd Boss
entity.GalacticraftCore.EvolvedSpider.name=esblygu Spider
entity.GalacticraftCore.EvolvedZombie.name=esblygu Zombie
entity.GalacticraftCore.Flag.name=Flag
entity.GalacticraftCore.GCFlag.name=Flag ##NEEDS TRANSLATE##
entity.GalacticraftCore.GravityArrow.name=Arrow
entity.GalacticraftCore.Lander.name=Gofod Lander
entity.GalacticraftCore.Meteor.name=Meteor
entity.GalacticraftCore.MeteorChunk.name=Meteor Chunk ##NEEDS TRANSLATE##
entity.GalacticraftCore.OxygenBubble.name=Ocsigen Bubble
entity.GalacticraftCore.ParaChest.name=Parachest
entity.GalacticraftCore.Spaceship.name=Haen 1 Roced

# schematics
schematic.moonbuggy.name = Moon Buggy
Expand Down
32 changes: 16 additions & 16 deletions src/main/resources/assets/galacticraftcore/lang/de_DE.lang
Original file line number Diff line number Diff line change
Expand Up @@ -204,22 +204,22 @@ tile.crudeOil.name=Öl
tile.fuelBlock.name=Treibstoff

# ENTITIES
entity.EvolvedSpider.name=Entwickelte Spinne
entity.EvolvedZombie.name=Entwickelter Zombie
entity.EvolvedCreeper.name=Entwickelter Creeper
entity.EvolvedSkeleton.name=Entwickeltes Skelett
entity.EvolvedSkeletonBoss.name=Entwickelter Skelett-Boss
entity.AlienVillager.name=Alien-Dorfbewohner
entity.Spaceship.name=Raumschiff
entity.GravityArrow.name=Pfeil
entity.Meteor.name=Meteor
entity.Buggy.name=Mondrover
entity.Flag.name=Flagge
entity.ParaChest.name=Paratruhe
entity.OxygenBubble.name=Sauerstoffblase
entity.Lander.name=Weltraum-Landekapsel
entity.GCFlag.name=Flagge
entity.MeteorChunk.name=Meteorbrocken
entity.GalacticraftCore.AlienVillager.name=Alien-Dorfbewohner
entity.GalacticraftCore.Buggy.name=Mondrover
entity.GalacticraftCore.EvolvedCreeper.name=Entwickelter Creeper
entity.GalacticraftCore.EvolvedSkeleton.name=Entwickeltes Skelett
entity.GalacticraftCore.EvolvedSkeletonBoss.name=Entwickelter Skelett-Boss
entity.GalacticraftCore.EvolvedSpider.name=Entwickelte Spinne
entity.GalacticraftCore.EvolvedZombie.name=Entwickelter Zombie
entity.GalacticraftCore.Flag.name=Flagge
entity.GalacticraftCore.GCFlag.name=Flagge
entity.GalacticraftCore.GravityArrow.name=Pfeil
entity.GalacticraftCore.Lander.name=Weltraum-Landekapsel
entity.GalacticraftCore.Meteor.name=Meteor
entity.GalacticraftCore.MeteorChunk.name=Meteorbrocken
entity.GalacticraftCore.OxygenBubble.name=Sauerstoffblase
entity.GalacticraftCore.ParaChest.name=Paratruhe
entity.GalacticraftCore.Spaceship.name=Raumschiff

# SCHEMATICS
schematic.moonbuggy.name=Mondrover
Expand Down
32 changes: 16 additions & 16 deletions src/main/resources/assets/galacticraftcore/lang/en_GB.lang
Original file line number Diff line number Diff line change
Expand Up @@ -219,22 +219,22 @@ tile.crudeOil.name=Oil
tile.fuelBlock.name=Fuel

# ENTITIES
entity.EvolvedSpider.name=Evolved Spider
entity.EvolvedZombie.name=Evolved Zombie
entity.EvolvedCreeper.name=Evolved Creeper
entity.EvolvedSkeleton.name=Evolved Skeleton
entity.EvolvedSkeletonBoss.name=Evolved Skeleton Boss
entity.AlienVillager.name=Alien Villager
entity.Spaceship.name=Tier 1 Rocket
entity.GravityArrow.name=Arrow
entity.Meteor.name=Meteor
entity.Buggy.name=Buggy
entity.Flag.name=Flag
entity.ParaChest.name=Parachest
entity.OxygenBubble.name=Oxygen Bubble
entity.Lander.name=Space Lander
entity.GCFlag.name=Flag
entity.MeteorChunk.name=Meteor Chunk
entity.GalacticraftCore.AlienVillager.name=Alien Villager
entity.GalacticraftCore.Buggy.name=Buggy
entity.GalacticraftCore.EvolvedCreeper.name=Evolved Creeper
entity.GalacticraftCore.EvolvedSkeleton.name=Evolved Skeleton
entity.GalacticraftCore.EvolvedSkeletonBoss.name=Evolved Skeleton Boss
entity.GalacticraftCore.EvolvedSpider.name=Evolved Spider
entity.GalacticraftCore.EvolvedZombie.name=Evolved Zombie
entity.GalacticraftCore.Flag.name=Flag
entity.GalacticraftCore.GCFlag.name=Flag
entity.GalacticraftCore.GravityArrow.name=Arrow
entity.GalacticraftCore.Lander.name=Space Lander
entity.GalacticraftCore.Meteor.name=Meteor
entity.GalacticraftCore.MeteorChunk.name=Meteor Chunk
entity.GalacticraftCore.OxygenBubble.name=Oxygen Bubble
entity.GalacticraftCore.ParaChest.name=Parachest
entity.GalacticraftCore.Spaceship.name=Tier 1 Rocket

# Schematics
schematic.moonbuggy.name=Moon Buggy
Expand Down
32 changes: 16 additions & 16 deletions src/main/resources/assets/galacticraftcore/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -208,22 +208,22 @@ tile.crudeOil.name=Oil
tile.fuelBlock.name=Fuel

# ENTITIES
entity.EvolvedSpider.name=Evolved Spider
entity.EvolvedZombie.name=Evolved Zombie
entity.EvolvedCreeper.name=Evolved Creeper
entity.EvolvedSkeleton.name=Evolved Skeleton
entity.EvolvedSkeletonBoss.name=Evolved Skeleton Boss
entity.AlienVillager.name=Alien Villager
entity.Spaceship.name=Tier 1 Rocket
entity.GravityArrow.name=Arrow
entity.Meteor.name=Meteor
entity.Buggy.name=Buggy
entity.Flag.name=Flag
entity.ParaChest.name=Parachest
entity.OxygenBubble.name=Oxygen Bubble
entity.Lander.name=Space Lander
entity.GCFlag.name=Flag
entity.MeteorChunk.name=Meteor Chunk
entity.GalacticraftCore.AlienVillager.name=Alien Villager
entity.GalacticraftCore.Buggy.name=Buggy
entity.GalacticraftCore.EvolvedCreeper.name=Evolved Creeper
entity.GalacticraftCore.EvolvedSkeleton.name=Evolved Skeleton
entity.GalacticraftCore.EvolvedSkeletonBoss.name=Evolved Skeleton Boss
entity.GalacticraftCore.EvolvedSpider.name=Evolved Spider
entity.GalacticraftCore.EvolvedZombie.name=Evolved Zombie
entity.GalacticraftCore.Flag.name=Flag
entity.GalacticraftCore.GCFlag.name=Flag
entity.GalacticraftCore.GravityArrow.name=Arrow
entity.GalacticraftCore.Lander.name=Space Lander
entity.GalacticraftCore.Meteor.name=Meteor
entity.GalacticraftCore.MeteorChunk.name=Meteor Chunk
entity.GalacticraftCore.OxygenBubble.name=Oxygen Bubble
entity.GalacticraftCore.ParaChest.name=Parachest
entity.GalacticraftCore.Spaceship.name=Tier 1 Rocket

# SCHEMATICS
schematic.moonbuggy.name=Moon Buggy
Expand Down
32 changes: 16 additions & 16 deletions src/main/resources/assets/galacticraftcore/lang/es_ES.lang
Original file line number Diff line number Diff line change
Expand Up @@ -204,22 +204,22 @@ tile.crudeOil.name=Petróleo
tile.fuelBlock.name=Combustible

# ENTIDADES
entity.EvolvedSpider.name=Araña evolucionada
entity.EvolvedZombie.name=Zombie evolucionado
entity.EvolvedCreeper.name=Creeper evolucionado
entity.EvolvedSkeleton.name=Esqueleto evolucionado
entity.EvolvedSkeletonBoss.name=Jefe esqueleto evolucionado
entity.AlienVillager.name=Aldeano alien
entity.Spaceship.name=Cohete nivel 1
entity.GravityArrow.name=Flecha
entity.Meteor.name=Meteorito
entity.Buggy.name=Buggy
entity.Flag.name=Bandera
entity.ParaChest.name=Cofre-paraca
entity.OxygenBubble.name=Burbuja de oxígeno
entity.Lander.name=Aterrizador
entity.GCFlag.name=Bandera
entity.MeteorChunk.name=Trozo de meteorito
entity.GalacticraftCore.AlienVillager.name=Aldeano alien
entity.GalacticraftCore.Buggy.name=Buggy
entity.GalacticraftCore.EvolvedCreeper.name=Creeper evolucionado
entity.GalacticraftCore.EvolvedSkeleton.name=Esqueleto evolucionado
entity.GalacticraftCore.EvolvedSkeletonBoss.name=Jefe esqueleto evolucionado
entity.GalacticraftCore.EvolvedSpider.name=Araña evolucionada
entity.GalacticraftCore.EvolvedZombie.name=Zombie evolucionado
entity.GalacticraftCore.Flag.name=Bandera
entity.GalacticraftCore.GCFlag.name=Bandera
entity.GalacticraftCore.GravityArrow.name=Flecha
entity.GalacticraftCore.Lander.name=Aterrizador
entity.GalacticraftCore.Meteor.name=Meteorito
entity.GalacticraftCore.MeteorChunk.name=Trozo de meteorito
entity.GalacticraftCore.OxygenBubble.name=Burbuja de oxígeno
entity.GalacticraftCore.ParaChest.name=Cofre-paraca
entity.GalacticraftCore.Spaceship.name=Cohete nivel 1

# ESQUEMAS
schematic.moonbuggy.name=Buggy lunar
Expand Down
32 changes: 16 additions & 16 deletions src/main/resources/assets/galacticraftcore/lang/fi_FI.lang
Original file line number Diff line number Diff line change
Expand Up @@ -225,22 +225,22 @@ tile.crudeOil.name=Oil ##NEEDS TRANSLATE##
tile.fuelBlock.name=Fuel ##NEEDS TRANSLATE##

# ENTITIES
entity.EvolvedSpider.name=Evolved Spider
entity.EvolvedZombie.name=Evolved Zombie
entity.EvolvedCreeper.name=Evolved Creeper
entity.EvolvedSkeleton.name=Evolved Skeleton
entity.EvolvedSkeletonBoss.name=Evolved Skeleton Boss
entity.AlienVillager.name=Alien Villager
entity.Spaceship.name=Tason 1 raketti
entity.GravityArrow.name=Arrow
entity.Meteor.name=Pudonnut meteoriitti
entity.Buggy.name=Buggy
entity.Flag.name=Flag
entity.ParaChest.name=Parachest
entity.OxygenBubble.name=Oxygen Bubble
entity.Lander.name=Space Lander
entity.GCFlag.name=Flag ##NEEDS TRANSLATE##
entity.MeteorChunk.name=Meteor Chunk ##NEEDS TRANSLATE##
entity.GalacticraftCore.AlienVillager.name=Alien Villager
entity.GalacticraftCore.Buggy.name=Buggy
entity.GalacticraftCore.EvolvedCreeper.name=Evolved Creeper
entity.GalacticraftCore.EvolvedSkeleton.name=Evolved Skeleton
entity.GalacticraftCore.EvolvedSkeletonBoss.name=Evolved Skeleton Boss
entity.GalacticraftCore.EvolvedSpider.name=Evolved Spider
entity.GalacticraftCore.EvolvedZombie.name=Evolved Zombie
entity.GalacticraftCore.Flag.name=Flag
entity.GalacticraftCore.GCFlag.name=Flag ##NEEDS TRANSLATE##
entity.GalacticraftCore.GravityArrow.name=Arrow
entity.GalacticraftCore.Lander.name=Space Lander
entity.GalacticraftCore.Meteor.name=Pudonnut meteoriitti
entity.GalacticraftCore.MeteorChunk.name=Meteor Chunk ##NEEDS TRANSLATE##
entity.GalacticraftCore.OxygenBubble.name=Oxygen Bubble
entity.GalacticraftCore.ParaChest.name=Parachest
entity.GalacticraftCore.Spaceship.name=Tason 1 raketti

# Schematics
schematic.moonbuggy.name=Kuuvaunu
Expand Down
32 changes: 16 additions & 16 deletions src/main/resources/assets/galacticraftcore/lang/fr_CA.lang
Original file line number Diff line number Diff line change
Expand Up @@ -263,22 +263,22 @@ tile.crudeOil.name=Oil ##NEEDS TRANSLATE##
tile.fuelBlock.name=Fuel ##NEEDS TRANSLATE##

# ENTITIES
entity.EvolvedSpider.name=Evolved Spider
entity.EvolvedZombie.name=Evolved Zombie
entity.EvolvedCreeper.name=Evolved Creeper
entity.EvolvedSkeleton.name=Evolved Skeleton
entity.EvolvedSkeletonBoss.name=Evolved Skeleton Boss
entity.AlienVillager.name=Alien Villager
entity.Spaceship.name=Tier 1 Rocket
entity.GravityArrow.name=Arrow
entity.Meteor.name=Meteor
entity.Buggy.name=Buggy
entity.Flag.name=Flag
entity.ParaChest.name=Parachest
entity.OxygenBubble.name=Oxygen Bubble
entity.Lander.name=Space Lander
entity.GCFlag.name=Flag ##NEEDS TRANSLATE##
entity.MeteorChunk.name=Meteor Chunk ##NEEDS TRANSLATE##
entity.GalacticraftCore.AlienVillager.name=Alien Villager
entity.GalacticraftCore.Buggy.name=Buggy
entity.GalacticraftCore.EvolvedCreeper.name=Evolved Creeper
entity.GalacticraftCore.EvolvedSkeleton.name=Evolved Skeleton
entity.GalacticraftCore.EvolvedSkeletonBoss.name=Evolved Skeleton Boss
entity.GalacticraftCore.EvolvedSpider.name=Evolved Spider
entity.GalacticraftCore.EvolvedZombie.name=Evolved Zombie
entity.GalacticraftCore.Flag.name=Flag
entity.GalacticraftCore.GCFlag.name=Flag ##NEEDS TRANSLATE##
entity.GalacticraftCore.GravityArrow.name=Arrow
entity.GalacticraftCore.Lander.name=Space Lander
entity.GalacticraftCore.Meteor.name=Meteor
entity.GalacticraftCore.MeteorChunk.name=Meteor Chunk ##NEEDS TRANSLATE##
entity.GalacticraftCore.OxygenBubble.name=Oxygen Bubble
entity.GalacticraftCore.ParaChest.name=Parachest
entity.GalacticraftCore.Spaceship.name=Tier 1 Rocket

# Schematics
schematic.moonbuggy.name=Moon Buggy
Expand Down
Loading