mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-15 09:44:50 +00:00
Minor cleanups (#50)
* Finalize, minor alloc reduction Also enable Jabel and generic injection * Update dependencies.gradle * Clean up Machine a bit * spotless more enhanced instanceof * Update ModuleMachine.java * More clen * WARN: Removed exception catching * Many, many tiny patches + birthday fix * Spotless * Spotless again * Fix getLow and clamp tolerance value * Revert event -> ignored on unused event parameters * Rename instanceof variables * Update Machine.java * Use StringBuilder * Cache getStack() * Oops, Jabel can't handle that * Spotless * Spotless again My IDE was fighting with it * Remove unused elements + scream test success
This commit is contained in:
1 parent
6b4f3eb1c7
commit
f0f14bb278
325 files changed
+1205
-1868
No files matched your search
@@ -22,8 +22,8 @@ public enum DesignSystem implements IDesignSystem {
|
||||
Wood,
|
||||
Glass;
|
||||
|
||||
protected Map<Integer, IIcon> primary;
|
||||
protected Map<Integer, IIcon> secondary;
|
||||
private final Map<Integer, IIcon> primary;
|
||||
private final Map<Integer, IIcon> secondary;
|
||||
|
||||
DesignSystem() {
|
||||
primary = new HashMap<>();
|
||||
@@ -33,85 +33,57 @@ public enum DesignSystem implements IDesignSystem {
|
||||
|
||||
@Override
|
||||
public IDesignMaterial getDefaultMaterial() {
|
||||
switch (this) {
|
||||
case Glass:
|
||||
return GlassType.get(0);
|
||||
|
||||
case Wood:
|
||||
return PlankType.ExtraTreePlanks.Fir;
|
||||
}
|
||||
return null;
|
||||
return switch (this) {
|
||||
case Glass -> GlassType.get(0);
|
||||
case Wood -> PlankType.ExtraTreePlanks.Fir;
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public IDesignMaterial getDefaultMaterial2() {
|
||||
switch (this) {
|
||||
case Glass:
|
||||
return GlassType.get(1);
|
||||
|
||||
case Wood:
|
||||
return PlankType.ExtraTreePlanks.Whitebeam;
|
||||
}
|
||||
return null;
|
||||
return switch (this) {
|
||||
case Glass -> GlassType.get(1);
|
||||
case Wood -> PlankType.ExtraTreePlanks.Whitebeam;
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public IDesignMaterial getMaterial(int id) {
|
||||
switch (this) {
|
||||
case Glass:
|
||||
return GlassType.get(id);
|
||||
|
||||
case Wood:
|
||||
return CarpentryManager.carpentryInterface.getWoodMaterial(id);
|
||||
}
|
||||
return null;
|
||||
return switch (this) {
|
||||
case Glass -> GlassType.get(id);
|
||||
case Wood -> CarpentryManager.carpentryInterface.getWoodMaterial(id);
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaterialIndex(IDesignMaterial id) {
|
||||
switch (this) {
|
||||
case Glass:
|
||||
return GlassType.getIndex(id);
|
||||
|
||||
case Wood:
|
||||
return CarpentryManager.carpentryInterface.getCarpentryWoodIndex(id);
|
||||
}
|
||||
return 0;
|
||||
return switch (this) {
|
||||
case Glass -> GlassType.getIndex(id);
|
||||
case Wood -> CarpentryManager.carpentryInterface.getCarpentryWoodIndex(id);
|
||||
};
|
||||
}
|
||||
|
||||
public String getTexturePath() {
|
||||
switch (this) {
|
||||
case Glass:
|
||||
return "glass";
|
||||
|
||||
case Wood:
|
||||
return "patterns";
|
||||
}
|
||||
return "";
|
||||
return switch (this) {
|
||||
case Glass -> "glass";
|
||||
case Wood -> "patterns";
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public IDesignMaterial getMaterial(ItemStack stack) {
|
||||
switch (this) {
|
||||
case Glass:
|
||||
return GlassType.get(stack);
|
||||
|
||||
case Wood:
|
||||
return CarpentryManager.carpentryInterface.getWoodMaterial(stack);
|
||||
}
|
||||
return null;
|
||||
return switch (this) {
|
||||
case Glass -> GlassType.get(stack);
|
||||
case Wood -> CarpentryManager.carpentryInterface.getWoodMaterial(stack);
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getAdhesive() {
|
||||
switch (this) {
|
||||
case Glass:
|
||||
return ExtraTreeItems.GlassFitting.get(1);
|
||||
|
||||
case Wood:
|
||||
return ExtraTreeItems.WoodWax.get(1);
|
||||
}
|
||||
return null;
|
||||
return switch (this) {
|
||||
case Glass -> ExtraTreeItems.GlassFitting.get(1);
|
||||
case Wood -> ExtraTreeItems.WoodWax.get(1);
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -132,7 +104,7 @@ public enum DesignSystem implements IDesignSystem {
|
||||
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
for (EnumPattern pattern : EnumPattern.values()) {
|
||||
for (final EnumPattern pattern : EnumPattern.VALUES) {
|
||||
primary.put(
|
||||
pattern.ordinal(),
|
||||
BinnieCore.proxy.getIcon(
|
||||
|
||||
Reference in new issue
Block a user