maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Possible solution for #1798

Browse source
This commit is contained in:
modmuss50 2019-08-20 16:44:25 +01:00
parent 6114f45d9b
commit 92b3bc6651
5 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
View file

@ -46,6 +46,8 @@ import reborncore.common.BaseBlockEntityProvider;
import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.util.WrenchUtils;
import java.util.Locale;
/**
* Created by Rushmead
*/
@ -89,7 +91,7 @@ public abstract class BlockEnergyStorage extends BaseBlockEntityProvider {
if (fullName.equalsIgnoreCase("LESU")) {
return "ev_multi";
}
return fullName.toLowerCase();
return fullName.toLowerCase(Locale.ROOT);
}
// Block

5
src/main/java/techreborn/client/EGui.java
View file

@ -32,6 +32,7 @@ import net.minecraft.world.World;
import reborncore.api.blockentity.IMachineGuiHandler;
import java.util.Arrays;
import java.util.Locale;
import java.util.stream.Stream;
public enum EGui implements IMachineGuiHandler {
@ -93,7 +94,7 @@ public enum EGui implements IMachineGuiHandler {
public static EGui byID(Identifier resourceLocation){
return Arrays.stream(values())
.filter(eGui -> eGui.name().toLowerCase().equals(resourceLocation.getPath()))
.filter(eGui -> eGui.name().toLowerCase(Locale.ROOT).equals(resourceLocation.getPath()))
.findFirst()
.orElseThrow(() -> new RuntimeException("Failed to find gui for " + resourceLocation));
}
@ -103,7 +104,7 @@ public enum EGui implements IMachineGuiHandler {
}
public Identifier getID(){
return new Identifier("techreborn", name().toLowerCase());
return new Identifier("techreborn", name().toLowerCase(Locale.ROOT));
}
@Override

6
src/main/java/techreborn/init/ModFluids.java
View file

@ -33,6 +33,8 @@ import net.minecraft.util.registry.Registry;
import reborncore.common.fluid.*;
import techreborn.TechReborn;
import java.util.Locale;
public enum ModFluids {
BERYLLIUM,
CALCIUM,
@ -78,11 +80,11 @@ public enum ModFluids {
private final Identifier identifier;
ModFluids() {
this.identifier = new Identifier(TechReborn.MOD_ID, this.toString().toLowerCase());
this.identifier = new Identifier(TechReborn.MOD_ID, this.toString().toLowerCase(Locale.ROOT));
FluidSettings fluidSettings = FluidSettings.create();
Identifier texture = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.toString().toLowerCase() + "_flowing");
Identifier texture = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.toString().toLowerCase(Locale.ROOT) + "_flowing");
fluidSettings.setStillTexture(texture);
fluidSettings.setFlowingTexture(texture);

3
src/main/java/techreborn/init/TRArmorMaterial.java
View file

@ -31,6 +31,7 @@ import net.minecraft.sound.SoundEvent;
import net.minecraft.sound.SoundEvents;
import net.minecraft.util.Lazy;
import java.util.Locale;
import java.util.function.Supplier;
@ -98,7 +99,7 @@ public enum TRArmorMaterial implements ArmorMaterial {
@Override
public String getName() {
return this.toString().toLowerCase();
return this.toString().toLowerCase(Locale.ROOT);
}
@Override

29
src/main/java/techreborn/init/TRContent.java
View file

@ -70,6 +70,7 @@ import techreborn.utils.InitUtils;
import javax.annotation.Nullable;
import java.util.Arrays;
import java.util.Locale;
import java.util.function.Function;
public class TRContent {
@ -220,7 +221,7 @@ public class TRContent {
public final EnumPowerTier powerTier;
SolarPanels(EnumPowerTier tier, int generationRateD, int generationRateN) {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
powerTier = tier;
block = new BlockSolarPanel(this);
this.generationRateD = generationRateD;
@ -261,7 +262,7 @@ public class TRContent {
Cables(int transferRate, double cableThickness, boolean canKill, EnumPowerTier tier) {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
this.transferRate = transferRate;
this.defaultTransferRate = transferRate;
this.cableThickness = cableThickness / 2;
@ -308,7 +309,7 @@ public class TRContent {
public final int maxY;
Ores(int veinSize, int veinsPerChunk, int minY, int maxY) {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
block = new Block(FabricBlockSettings.of(Material.STONE).strength(2f, 2f).build());
this.veinSize = veinSize;
this.veinsPerChunk = veinsPerChunk;
@ -332,7 +333,7 @@ public class TRContent {
public final Block block;
StorageBlocks() {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
block = new BlockStorage();
InitUtils.setup(block, name + "_storage_block");
}
@ -353,7 +354,7 @@ public class TRContent {
public final Block casing;
MachineBlocks(int casingHeatCapacity) {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
frame = new BlockMachineFrame();
InitUtils.setup(frame, name + "_machine_frame");
casing = new BlockMachineCasing(casingHeatCapacity);
@ -445,7 +446,7 @@ public class TRContent {
public final Block block;
<B extends Block> Machine(B block) {
this.name = this.toString().toLowerCase();
this.name = this.toString().toLowerCase(Locale.ROOT);
this.block = block;
InitUtils.setup(block, name);
}
@ -472,7 +473,7 @@ public class TRContent {
public final Item item;
Dusts() {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
InitUtils.setup(item, name + "_dust");
}
@ -503,7 +504,7 @@ public class TRContent {
public final Item item;
SmallDusts() {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
InitUtils.setup(item, name + "_small_dust");
}
@ -529,7 +530,7 @@ public class TRContent {
public final Item item;
Gems() {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
InitUtils.setup(item, name + "_gem");
}
@ -556,7 +557,7 @@ public class TRContent {
public final Item item;
Ingots() {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
InitUtils.setup(item, name + "_ingot");
}
@ -583,7 +584,7 @@ public class TRContent {
public final Item item;
Nuggets() {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
InitUtils.setup(item, name + "_nugget");
}
@ -654,7 +655,7 @@ public class TRContent {
public final Item item;
Parts() {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
InitUtils.setup(item, name);
}
@ -683,7 +684,7 @@ public class TRContent {
public final Item item;
Plates() {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
InitUtils.setup(item, name + "_plate");
}
@ -747,7 +748,7 @@ public class TRContent {
public Item item;
Upgrades(IUpgrade upgrade) {
name = this.toString().toLowerCase();
name = this.toString().toLowerCase(Locale.ROOT);
item = new ItemUpgrade(name, upgrade);
InitUtils.setup(item, name + "_upgrade");
}