dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update changelog, remove unused fields.

Browse Source
This commit is contained in:
raoulvdberge
2020-09-25 00:48:17 +02:00
parent 14e63c07ca
commit 3e42134128
3 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/refinedmods/refinedstorage/RSItems.java
View File

@@ -62,22 +62,22 @@ public final class RSItems {
private static final List<Runnable> LATE_REGISTRATION = new ArrayList<>();
public static final ColorMap<BlockItem> CRAFTER = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> RELAY = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> NETWORK_TRANSMITTER = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> NETWORK_RECEIVER = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> CONTROLLER = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> CREATIVE_CONTROLLER = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> GRID = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> CRAFTING_GRID = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> PATTERN_GRID = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> FLUID_GRID = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> SECURITY_MANAGER = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> WIRELESS_TRANSMITTER = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> DISK_MANIPULATOR = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> CRAFTER_MANAGER = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> CRAFTING_MONITOR = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> DETECTOR = new ColorMap<>(ITEMS, LATE_REGISTRATION, COLORED_ITEM_TAGS);
public static final ColorMap<BlockItem> CRAFTER = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> RELAY = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> NETWORK_TRANSMITTER = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> NETWORK_RECEIVER = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> CONTROLLER = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> CREATIVE_CONTROLLER = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> GRID = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> CRAFTING_GRID = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> PATTERN_GRID = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> FLUID_GRID = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> SECURITY_MANAGER = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> WIRELESS_TRANSMITTER = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> DISK_MANIPULATOR = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> CRAFTER_MANAGER = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> CRAFTING_MONITOR = new ColorMap<>(ITEMS, LATE_REGISTRATION);
public static final ColorMap<BlockItem> DETECTOR = new ColorMap<>(ITEMS, LATE_REGISTRATION);
static {
CONSTRUCTION_CORE = ITEMS.register("construction_core", CoreItem::new);

11
src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java
View File

@@ -20,7 +20,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.GameType;
import net.minecraft.world.World;
import net.minecraftforge.common.Tags;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.IForgeRegistryEntry;
@@ -37,19 +36,17 @@ public class ColorMap<T extends IForgeRegistryEntry<? super T>> {
private final Map<DyeColor, RegistryObject<T>> colorMap = new HashMap<>();
private DeferredRegister<Item> itemRegister = null;
private DeferredRegister<Block> blockRegister = null;
private List<Runnable> lateRegistration = null;
private Map<Tags.IOptionalNamedTag<Item>, ColorMap<BlockItem>> itemTags = null;
private DeferredRegister<Item> itemRegister;
private DeferredRegister<Block> blockRegister;
private List<Runnable> lateRegistration;
public ColorMap(DeferredRegister<Block> blockRegister) {
this.blockRegister = blockRegister;
}
public ColorMap(DeferredRegister<Item> itemRegister, List<Runnable> lateRegistration, Map<Tags.IOptionalNamedTag<Item>, ColorMap<BlockItem>> itemTags) {
public ColorMap(DeferredRegister<Item> itemRegister, List<Runnable> lateRegistration) {
this.itemRegister = itemRegister;
this.lateRegistration = lateRegistration;
this.itemTags = itemTags;
}
public RegistryObject<T> get(DyeColor color) {