@@ -99,8 +99,6 @@ public class OrePrefix {
9999 public static final OrePrefix plateDouble = new OrePrefix ("plateDouble" , M * 2 , null , MaterialIconType .plateDouble , ENABLE_UNIFICATION , hasIngotProperty .and (mat -> mat .hasFlag (GENERATE_PLATE ) && !mat .hasFlag (NO_SMASHING )));
100100 // Regular Plate made of one Ingot/Dust. Introduced by Calclavia
101101 public static final OrePrefix plate = new OrePrefix ("plate" , M , null , MaterialIconType .plate , ENABLE_UNIFICATION , mat -> mat .hasFlag (GENERATE_PLATE ));
102- // Compressed Material, worth 1 Unit. Introduced by Galacticraft
103- public static final OrePrefix compressed = new OrePrefix ("compressed" , M * 2 , null , null , ENABLE_UNIFICATION , null );
104102
105103 // Round made of 1 Nugget
106104 public static final OrePrefix round = new OrePrefix ("round" , M / 9 , null , MaterialIconType .round , OrePrefix .Flags .ENABLE_UNIFICATION , mat -> mat .hasFlag (GENERATE_ROUND ));
@@ -165,7 +163,6 @@ public class OrePrefix {
165163 // made of 5 Ingots.
166164 public static final OrePrefix turbineBlade = new OrePrefix ("turbineBlade" , M * 10 , null , MaterialIconType .turbineBlade , ENABLE_UNIFICATION , hasToolProperty .and (m -> m .hasFlags (GENERATE_BOLT_SCREW , GENERATE_PLATE )));
167165
168- public static final OrePrefix glass = new OrePrefix ("glass" , -1 , Materials .Glass , null , SELF_REFERENCING , null );
169166 public static final OrePrefix paneGlass = new OrePrefix ("paneGlass" , -1 , MarkerMaterials .Color .Colorless , null , SELF_REFERENCING , null );
170167 public static final OrePrefix blockGlass = new OrePrefix ("blockGlass" , -1 , MarkerMaterials .Color .Colorless , null , SELF_REFERENCING , null );
171168
@@ -181,7 +178,6 @@ public class OrePrefix {
181178 public static final OrePrefix stone = new OrePrefix ("stone" , -1 , Materials .Stone , null , SELF_REFERENCING , null );
182179 public static final OrePrefix cobblestone = new OrePrefix ("cobblestone" , -1 , Materials .Stone , null , SELF_REFERENCING , null );
183180 // Prefix to determine which kind of Rock this is.
184- public static final OrePrefix rock = new OrePrefix ("rock" , -1 , Materials .Stone , null , SELF_REFERENCING , null );
185181 // Cobblestone Prefix for all Cobblestones.
186182 public static final OrePrefix stoneCobble = new OrePrefix ("stoneCobble" , -1 , Materials .Stone , null , SELF_REFERENCING , null );
187183
@@ -227,13 +223,10 @@ public class OrePrefix {
227223 *
228224 * @see MarkerMaterials.Tier
229225 */
230- public static final OrePrefix batterySingleUse = new OrePrefix ("batterySingleUse" , -1 , null , null , 0 , null );
231226 // Introduced by Calclavia
232227 public static final OrePrefix battery = new OrePrefix ("battery" , -1 , null , null , 0 , null );
233228 // Introduced by Calclavia
234229 public static final OrePrefix circuit = new OrePrefix ("circuit" , -1 , null , null , ENABLE_UNIFICATION , null );
235- // Introduced by Buildcraft
236- public static final OrePrefix chipset = new OrePrefix ("chipset" , -1 , null , null , ENABLE_UNIFICATION , null );
237230 public static final OrePrefix component = new OrePrefix ("component" , -1 , null , null , ENABLE_UNIFICATION , null );
238231
239232 // Used for Gregification Addon TODO Don't do these here post De-Enum
@@ -287,10 +280,8 @@ public static class Conditions {
287280
288281 craftingLens .setMarkerPrefix (true );
289282 dye .setMarkerPrefix (true );
290- batterySingleUse .setMarkerPrefix (true );
291283 battery .setMarkerPrefix (true );
292284 circuit .setMarkerPrefix (true );
293- chipset .setMarkerPrefix (true );
294285
295286 gem .setIgnored (Materials .Diamond );
296287 gem .setIgnored (Materials .Emerald );
0 commit comments